--- a/src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/Destinations.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -160,28 +160,28 @@
public static class CompatImg extends Destinations {
int transparency;
- public static String ShortNames[] = {
+ public static String[] ShortNames = {
"compatimg",
"opqcompatimg",
"bmcompatimg",
"transcompatimg",
};
- public static String ShortDescriptions[] = {
+ public static String[] ShortDescriptions = {
"Default",
"Opaque",
"Bitmask",
"Translucent",
};
- public static String LongDescriptions[] = {
+ public static String[] LongDescriptions = {
"Default Compatible Image",
"Opaque Compatible Image",
"Bitmask Compatible Image",
"Translucent Compatible Image",
};
- public static String ModifierNames[] = {
+ public static String[] ModifierNames = {
"CompatImage()",
"CompatImage(Opaque)",
"CompatImage(Bitmask)",
@@ -282,7 +282,7 @@
int type;
Image img;
- public static String ShortNames[] = {
+ public static String[] ShortNames = {
"custom",
"IntXrgb",
"IntArgb",
@@ -299,7 +299,7 @@
"ByteIndexed",
};
- public static String Descriptions[] = {
+ public static String[] Descriptions = {
"Custom Image",
"32-bit XRGB Packed Image",
"32-bit ARGB Packed Image",
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/J2DBench.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -187,7 +187,7 @@
System.exit(exitcode);
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
init();
TestEnvironment.init();
Result.init();
@@ -310,8 +310,8 @@
if (argv[i].indexOf(":") >= 0) {
- String values[] = argv[i].split(":");
- int intVals[] = new int[3];
+ String[] values = argv[i].split(":");
+ int[] intVals = new int[3];
for(int j=0; j<values.length; j++) {
try {
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/Option.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/Option.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -123,8 +123,8 @@
public static final int On = 1;
public static final int Both = 2;
- private static final String valnames[] = {"Off", "On", "Both"};
- private static final Boolean valuelist[][] = {
+ private static final String[] valnames = {"Off", "On", "Both"};
+ private static final Boolean[][] valuelist = {
BooleanIterator.FalseList,
BooleanIterator.TrueList,
BooleanIterator.FalseTrueList,
@@ -420,10 +420,10 @@
public static class ObjectList extends Option {
int size;
- String optionnames[];
- Object optionvalues[];
- String abbrevnames[];
- String descnames[];
+ String[] optionnames;
+ Object[] optionvalues;
+ String[] abbrevnames;
+ String[] descnames;
int defaultenabled;
int enabled;
JPanel jp;
@@ -431,10 +431,10 @@
int numrows;
public ObjectList(Group parent, String nodeName, String description,
- String optionnames[],
- Object optionvalues[],
- String abbrevnames[],
- String descnames[],
+ String[] optionnames,
+ Object[] optionvalues,
+ String[] abbrevnames,
+ String[] descnames,
int defaultenabled)
{
this(parent, nodeName, description,
@@ -448,10 +448,10 @@
public ObjectList(Group parent, String nodeName, String description,
int size,
- String optionnames[],
- Object optionvalues[],
- String abbrevnames[],
- String descnames[],
+ String[] optionnames,
+ Object[] optionvalues,
+ String[] abbrevnames,
+ String[] descnames,
int defaultenabled)
{
super(parent, nodeName, description);
@@ -463,20 +463,20 @@
this.enabled = this.defaultenabled = defaultenabled;
}
- private static String[] trim(String list[], int size) {
+ private static String[] trim(String[] list, int size) {
if (list.length == size) {
return list;
}
- String newlist[] = new String[size];
+ String[] newlist = new String[size];
System.arraycopy(list, 0, newlist, 0, size);
return newlist;
}
- private static Object[] trim(Object list[], int size) {
+ private static Object[] trim(Object[] list, int size) {
if (list.length == size) {
return list;
}
- Object newlist[] = new Object[size];
+ Object[] newlist = new Object[size];
System.arraycopy(list, 0, newlist, 0, size);
return newlist;
}
@@ -604,7 +604,7 @@
public static class IntList extends ObjectList {
public IntList(Group parent, String nodeName, String description,
- int values[], String abbrevnames[], String descnames[],
+ int[] values, String[] abbrevnames, String[] descnames,
int defaultenabled)
{
super(parent, nodeName, description,
@@ -612,16 +612,16 @@
abbrevnames, descnames, defaultenabled);
}
- private static String[] makeNames(int intvalues[]) {
- String names[] = new String[intvalues.length];
+ private static String[] makeNames(int[] intvalues) {
+ String[] names = new String[intvalues.length];
for (int i = 0; i < intvalues.length; i++) {
names[i] = Integer.toString(intvalues[i]);
}
return names;
}
- private static Object[] makeValues(int intvalues[]) {
- Object values[] = new Object[intvalues.length];
+ private static Object[] makeValues(int[] intvalues) {
+ Object[] values = new Object[intvalues.length];
for (int i = 0; i < intvalues.length; i++) {
values[i] = new Integer(intvalues[i]);
}
@@ -631,20 +631,20 @@
public static class ObjectChoice extends Option {
int size;
- String optionnames[];
- Object optionvalues[];
- String abbrevnames[];
- String descnames[];
+ String[] optionnames;
+ Object[] optionvalues;
+ String[] abbrevnames;
+ String[] descnames;
int defaultselected;
int selected;
JPanel jp;
JComboBox jcombo;
public ObjectChoice(Group parent, String nodeName, String description,
- String optionnames[],
- Object optionvalues[],
- String abbrevnames[],
- String descnames[],
+ String[] optionnames,
+ Object[] optionvalues,
+ String[] abbrevnames,
+ String[] descnames,
int defaultselected)
{
this(parent, nodeName, description,
@@ -658,10 +658,10 @@
public ObjectChoice(Group parent, String nodeName, String description,
int size,
- String optionnames[],
- Object optionvalues[],
- String abbrevnames[],
- String descnames[],
+ String[] optionnames,
+ Object[] optionvalues,
+ String[] abbrevnames,
+ String[] descnames,
int defaultselected)
{
super(parent, nodeName, description);
@@ -673,20 +673,20 @@
this.selected = this.defaultselected = defaultselected;
}
- private static String[] trim(String list[], int size) {
+ private static String[] trim(String[] list, int size) {
if (list.length == size) {
return list;
}
- String newlist[] = new String[size];
+ String[] newlist = new String[size];
System.arraycopy(list, 0, newlist, 0, size);
return newlist;
}
- private static Object[] trim(Object list[], int size) {
+ private static Object[] trim(Object[] list, int size) {
if (list.length == size) {
return list;
}
- Object newlist[] = new Object[size];
+ Object[] newlist = new Object[size];
System.arraycopy(list, 0, newlist, 0, size);
return newlist;
}
@@ -799,21 +799,21 @@
}
public static class BooleanIterator implements Modifier.Iterator {
- private Boolean list[];
+ private Boolean[] list;
private int index;
- public static final Boolean FalseList[] = { Boolean.FALSE };
- public static final Boolean TrueList[] = { Boolean.TRUE };
- public static final Boolean
- FalseTrueList[] = { Boolean.FALSE, Boolean.TRUE };
- public static final Boolean
- TrueFalseList[] = { Boolean.TRUE, Boolean.FALSE };
+ public static final Boolean[] FalseList = { Boolean.FALSE };
+ public static final Boolean[] TrueList = { Boolean.TRUE };
+ public static final Boolean[]
+ FalseTrueList = { Boolean.FALSE, Boolean.TRUE };
+ public static final Boolean[]
+ TrueFalseList = { Boolean.TRUE, Boolean.FALSE };
public BooleanIterator(boolean v) {
this(v ? TrueList : FalseList);
}
- public BooleanIterator(Boolean list[]) {
+ public BooleanIterator(Boolean[] list) {
this.list = list;
}
@@ -834,7 +834,7 @@
}
public static class SwitchIterator implements Modifier.Iterator {
- private Object list[];
+ private Object[] list;
private int enabled;
private int index;
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/Result.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/Result.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -70,7 +70,7 @@
resultoptroot = new Group(TestEnvironment.globaloptroot,
"results", "Result Options");
- String workStrings[] = {
+ String[] workStrings = {
"units",
"kilounits",
"megaunits",
@@ -80,7 +80,7 @@
"megaops",
"autoops",
};
- String workDescriptions[] = {
+ String[] workDescriptions = {
"Test Units",
"Thousands of Test Units",
"Millions of Test Units",
@@ -90,7 +90,7 @@
"Millions of Operations",
"Auto-scaled Operations",
};
- Integer workObjects[] = {
+ Integer[] workObjects = {
new Integer(WORK_UNITS),
new Integer(WORK_THOUSANDS),
new Integer(WORK_MILLIONS),
@@ -105,21 +105,21 @@
workStrings, workObjects,
workStrings, workDescriptions,
0);
- String timeStrings[] = {
+ String[] timeStrings = {
"sec",
"msec",
"usec",
"nsec",
"autosec",
};
- String timeDescriptions[] = {
+ String[] timeDescriptions = {
"Seconds",
"Milliseconds",
"Microseconds",
"Nanoseconds",
"Auto-scaled seconds",
};
- Integer timeObjects[] = {
+ Integer[] timeObjects = {
new Integer(TIME_SECONDS),
new Integer(TIME_MILLIS),
new Integer(TIME_MICROS),
@@ -131,15 +131,15 @@
timeStrings, timeObjects,
timeStrings, timeDescriptions,
0);
- String rateStrings[] = {
+ String[] rateStrings = {
"unitspersec",
"secsperunit",
};
- String rateDescriptions[] = {
+ String[] rateDescriptions = {
"Work units per Time",
"Time units per Work",
};
- Boolean rateObjects[] = {
+ Boolean[] rateObjects = {
Boolean.FALSE,
Boolean.TRUE,
};
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -51,7 +51,7 @@
static Hashtable ignoreprops;
// Preferred props - will be listed even if undefined
- static String preferredkeys[] = {
+ static String[] preferredkeys = {
"java.version",
"java.runtime.version",
"java.class.version",
@@ -69,7 +69,7 @@
};
// Ignored props - will not be copied to results file
- static String ignoredkeys[] = {
+ static String[] ignoredkeys = {
"user.dir",
"user.home",
"user.timezone",
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -468,7 +468,7 @@
/**
* main
*/
- public static void main(String args[]) {
+ public static void main(String[] args) {
String resDir = ".";
ArrayList results = new ArrayList();
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/report/IIOComparator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -284,7 +284,7 @@
String key = (String)e.nextElement();
keylist.add(key);
}
- String keys[] = new String[keylist.size()];
+ String[] keys = new String[keylist.size()];
keylist.copyInto(keys);
if (special) {
sort2(keys);
@@ -294,7 +294,7 @@
return keys;
}
- public static void sort(String strs[]) {
+ public static void sort(String[] strs) {
for (int i = 1; i < strs.length; i++) {
for (int j = i; j > 0; j--) {
if (strs[j].compareTo(strs[j-1]) >= 0) {
@@ -307,7 +307,7 @@
}
}
- public static void sort2(String strs[]) {
+ public static void sort2(String[] strs) {
for (int i = 1; i < strs.length; i++) {
for (int j = i; j > 0; j--) {
if (compare(strs[j-1], strs[j])) {
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -91,12 +91,12 @@
"are best of all result sets in that group");
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
boolean gavehelp = false;
boolean graph = false;
boolean ignoreuncontested = true;
if (argv.length > 0 && argv[0].equalsIgnoreCase("-html")) {
- String newargs[] = new String[argv.length-1];
+ String[] newargs = new String[argv.length-1];
System.arraycopy(argv, 1, newargs, 0, newargs.length);
HTMLSeriesReporter.main(newargs);
return;
@@ -144,15 +144,15 @@
}
int numsets = results.size();
- double totalscore[] = new double[numsets];
- int numwins[] = new int[numsets];
- int numties[] = new int[numsets];
- int numloss[] = new int[numsets];
- int numtests[] = new int[numsets];
- double bestscore[] = new double[numsets];
- double worstscore[] = new double[numsets];
- double bestspread[] = new double[numsets];
- double worstspread[] = new double[numsets];
+ double[] totalscore = new double[numsets];
+ int[] numwins = new int[numsets];
+ int[] numties = new int[numsets];
+ int[] numloss = new int[numsets];
+ int[] numtests = new int[numsets];
+ double[] bestscore = new double[numsets];
+ double[] worstscore = new double[numsets];
+ double[] bestspread = new double[numsets];
+ double[] worstspread = new double[numsets];
for (int i = 0; i < numsets; i++) {
bestscore[i] = Double.NEGATIVE_INFINITY;
worstscore[i] = Double.POSITIVE_INFINITY;
@@ -166,7 +166,7 @@
while (enum_.hasMoreElements()) {
keyvector.add(enum_.nextElement());
}
- String keys[] = new String[keyvector.size()];
+ String[] keys = new String[keyvector.size()];
keyvector.copyInto(keys);
sort(keys);
enum_ = ResultHolder.commonkeys.keys();
@@ -647,7 +647,7 @@
}
private String makeKey(boolean prunecommon) {
- String keys[] = new String[options.size()];
+ String[] keys = new String[options.size()];
Enumeration enum_ = options.keys();
int i = 0;
while (enum_.hasMoreElements()) {
@@ -811,7 +811,7 @@
return ret;
}
- public static void sort(String strs[]) {
+ public static void sort(String[] strs) {
for (int i = 1; i < strs.length; i++) {
for (int j = i; j > 0; j--) {
if (strs[j].compareTo(strs[j-1]) >= 0) {
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -102,7 +102,7 @@
*/
private static void addGroup(String testName) {
- String testNameSplit[] = testName.replace('.', '_').split("_");
+ String[] testNameSplit = testName.replace('.', '_').split("_");
String group = testNameSplit[0];
for(int i=1; i<LEVEL; i++) {
group = group + "." + testNameSplit[i];
@@ -119,7 +119,7 @@
*/
private static String getDisplayGroupName(String group) {
- String groupSplit[] = group.replace('.', '_').split("_");
+ String[] groupSplit = group.replace('.', '_').split("_");
StringBuffer groupName = new StringBuffer();
String tempName = null;
@@ -142,7 +142,7 @@
*/
private static String getGroup(String testName) {
- String testNameSplit[] = testName.replace('.', '_').split("_");
+ String[] testNameSplit = testName.replace('.', '_').split("_");
String group = testNameSplit[0];
for(int i=1; i<LEVEL; i++) {
group = group + "." + testNameSplit[i];
@@ -200,7 +200,7 @@
while (enum_.hasMoreElements()) {
keyvector.add(enum_.nextElement());
}
- String keys[] = new String[keyvector.size()];
+ String[] keys = new String[keyvector.size()];
keyvector.copyInto(keys);
J2DAnalyzer.sort(keys);
@@ -323,7 +323,7 @@
while (baseEnum_.hasMoreElements()) {
baseKeyvector.add(baseEnum_.nextElement());
}
- String baseKeys[] = new String[baseKeyvector.size()];
+ String[] baseKeys = new String[baseKeyvector.size()];
baseKeyvector.copyInto(baseKeys);
J2DAnalyzer.sort(baseKeys);
@@ -337,7 +337,7 @@
while (targetEnum_.hasMoreElements()) {
targetKeyvector.add(targetEnum_.nextElement());
}
- String targetKeys[] = new String[targetKeyvector.size()];
+ String[] targetKeys = new String[targetKeyvector.size()];
targetKeyvector.copyInto(targetKeys);
J2DAnalyzer.sort(targetKeys);
@@ -797,7 +797,7 @@
"</font></td></tr>");
testResultsScoreBuffer.append(testResultsStartBuffer);
- String tableTags[] = null;
+ String[] tableTags = null;
for(int i=0; i<testCaseList.length; i++) {
@@ -1350,7 +1350,7 @@
/**
* main
*/
- public static void main(String args[]) {
+ public static void main(String[] args) {
String resDir = ".";
String baseXML = null;
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -126,7 +126,7 @@
"Huge Shapes (4000x4000)",
}, 0xa);
if (hasGraphics2D) {
- String rulenames[] = {
+ String[] rulenames = {
"Clear",
"Src",
"Dst",
@@ -140,8 +140,8 @@
"DstAtop",
"Xor",
};
- String ruledescs[] = new String[rulenames.length];
- Object rules[] = new Object[rulenames.length];
+ String[] ruledescs = new String[rulenames.length];
+ Object[] rules = new Object[rulenames.length];
int j = 0;
int defrule = 0;
for (int i = 0; i < rulenames.length; i++) {
@@ -181,7 +181,7 @@
ruledescs, (1 << defrule));
((Option.ObjectList) compRules).setNumRows(4);
- Transform xforms[] = {
+ Transform[] xforms = {
Identity.instance,
FTranslate.instance,
Scale2x2.instance,
@@ -189,8 +189,8 @@
ShearX.instance,
ShearY.instance,
};
- String xformnames[] = new String[xforms.length];
- String xformdescs[] = new String[xforms.length];
+ String[] xformnames = new String[xforms.length];
+ String[] xformdescs = new String[xforms.length];
for (int i = 0; i < xforms.length; i++) {
xformnames[i] = xforms[i].getShortName();
xformdescs[i] = xforms[i].getDescription();
@@ -214,7 +214,7 @@
new Option.Toggle(groptroot, "clip",
"Render through a complex clip shape",
Option.Toggle.Off);
- String rhintnames[] = {
+ String[] rhintnames = {
"Default", "Speed", "Quality",
};
renderHint =
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/ImageTests.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -116,11 +116,11 @@
static Option doTouchSrc;
static Option interpolation;
- static String transNodeNames[] = {
+ static String[] transNodeNames = {
null, "opaque", "bitmask", "translucent",
};
- static String transDescriptions[] = {
+ static String[] transDescriptions = {
null, "Opaque", "Bitmask", "Translucent",
};
@@ -220,7 +220,7 @@
new RasterOpFilter(false);
new RasterOpFilter(true);
- String interpolationnames[] = {"Nearest neighbor", "Bilinear",
+ String[] interpolationnames = {"Nearest neighbor", "Bilinear",
"Bicubic",};
interpolation =
new ObjectList(imgtestOptRoot, "interpolation",
@@ -369,7 +369,7 @@
int type;
boolean unmanaged;
- static int Transparencies[] = {
+ static int[] Transparencies = {
Transparency.TRANSLUCENT, // "custom",
Transparency.OPAQUE, // "IntXrgb",
Transparency.TRANSLUCENT, // "IntArgb",
@@ -433,7 +433,7 @@
public Image makeImage(TestEnvironment env, int w, int h) {
if (icm == null) {
- int cmap[] = new int[256];
+ int[] cmap = new int[256];
// Workaround for transparency rendering bug in earlier VMs
// Can only render transparency if first cmap entry is 0x0
// This bug is fixed in 1.4.2 (Mantis)
@@ -462,7 +462,7 @@
static Color translucentGreen = makeAlphaColor(Color.green, 128);
static Color translucentYellow = makeAlphaColor(Color.yellow, 64);
- static Color colorsets[][] = new Color[][] {
+ static Color[][] colorsets = new Color[][] {
null,
{
Color.blue, Color.red,
@@ -838,8 +838,8 @@
ictx.bufImgOp = new ConvolveOp(kernel, edge, null);
} else if (op.startsWith("lookup")) {
if (op.endsWith("byte")) {
- byte invert[] = new byte[256];
- byte ordered[] = new byte[256];
+ byte[] invert = new byte[256];
+ byte[] ordered = new byte[256];
for (int j = 0; j < 256 ; j++) {
invert[j] = (byte)(255-j);
ordered[j] = (byte)j;
@@ -856,8 +856,8 @@
null);
}
} else { // (op.endsWith("short"))
- short invert[] = new short[256];
- short ordered[] = new short[256];
+ short[] invert = new short[256];
+ short[] ordered = new short[256];
for (int j = 0; j < 256 ; j++) {
invert[j] = (short)((255-j) * 255);
ordered[j] = (short)(j * 255);
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/PixelTests.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -133,7 +133,7 @@
BufferedImage bimg;
WritableRaster ras;
DataBuffer db;
- int pixeldata[];
+ int[] pixeldata;
Object elemdata;
}
@@ -172,14 +172,14 @@
}
public static class BufImg extends Option.Enable {
- public static int rgbvals[] = {
+ public static int[] rgbvals = {
0x00000000,
0xff0000ff,
0x8000ff00,
0xffffffff
};
- static int cmap[] = {
+ static int[] cmap = {
0xff000000, // 0: opaque black
0xffffffff, // 1: opaque white
@@ -333,7 +333,7 @@
public void runTest(Object context, int numReps) {
Raster ras = ((Context) context).ras;
- int pixeldata[] = ((Context) context).pixeldata;
+ int[] pixeldata = ((Context) context).pixeldata;
do {
ras.getPixel(numReps&7, 0, pixeldata);
} while (--numReps > 0);
@@ -347,7 +347,7 @@
public void runTest(Object context, int numReps) {
WritableRaster ras = ((Context) context).ras;
- int pixeldata[] = ((Context) context).pixeldata;
+ int[] pixeldata = ((Context) context).pixeldata;
do {
ras.setPixel(numReps&7, 0, pixeldata);
} while (--numReps > 0);
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/tests/RenderTests.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -83,8 +83,8 @@
static final int NUM_RANDOMCOLORS = 4096;
static final int NUM_RANDOMCOLORMASK = (NUM_RANDOMCOLORS - 1);
- static Color randAlphaColors[];
- static Color randOpaqueColors[];
+ static Color[] randAlphaColors;
+ static Color[] randOpaqueColors;
static {
randOpaqueColors = new Color[NUM_RANDOMCOLORS];
@@ -161,7 +161,7 @@
new Option.Toggle(renderoptroot, "antialias",
"Render shapes antialiased",
Option.Toggle.Off);
- String strokeStrings[] = {
+ String[] strokeStrings = {
"width0",
"width1",
"width5",
@@ -171,7 +171,7 @@
"dash5_20",
"dash20_50",
};
- String strokeDescriptions[] = {
+ String[] strokeDescriptions = {
"Solid Thin lines",
"Solid Width 1 lines",
"Solid Width 5 lines",
@@ -181,7 +181,7 @@
"Dashed Width 5 lines",
"Dashed Width 20 lines",
};
- BasicStroke strokeObjects[] = {
+ BasicStroke[] strokeObjects = {
new BasicStroke(0f),
new BasicStroke(1f),
new BasicStroke(5f),
@@ -272,7 +272,7 @@
public static class Context extends GraphicsTests.Context {
int colorindex;
- Color colorlist[];
+ Color[] colorlist;
}
public RenderTests(Group parent, String nodeName, String description) {
@@ -410,7 +410,7 @@
int y = rctx.initY;
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
if (rctx.animate) {
do {
@@ -455,7 +455,7 @@
int y = rctx.initY;
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
if (rctx.animate) {
do {
@@ -500,7 +500,7 @@
int y = rctx.initY;
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
if (rctx.animate) {
do {
@@ -536,7 +536,7 @@
int y = rctx.initY;
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
if (rctx.animate) {
do {
@@ -583,7 +583,7 @@
int y = rctx.initY;
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
if (rctx.animate) {
do {
@@ -626,7 +626,7 @@
int y = rctx.initY;
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
if (rctx.animate) {
do {
@@ -680,7 +680,7 @@
int y = rctx.initY;
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
if (rctx.animate) {
do {
@@ -733,11 +733,11 @@
int size = rctx.size;
int x = rctx.initX;
int y = rctx.initY;
- int hexaX[] = new int[6];
- int hexaY[] = new int[6];
+ int[] hexaX = new int[6];
+ int[] hexaY = new int[6];
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
do {
hexaX[0] = x;
@@ -798,11 +798,11 @@
int size = rctx.size - 1;
int x = rctx.initX;
int y = rctx.initY;
- int hexaX[] = new int[6];
- int hexaY[] = new int[6];
+ int[] hexaX = new int[6];
+ int[] hexaY = new int[6];
Graphics g = rctx.graphics;
g.translate(rctx.orgX, rctx.orgY);
- Color rCArray[] = rctx.colorlist;
+ Color[] rCArray = rctx.colorlist;
int ci = rctx.colorindex;
do {
hexaX[0] = x;
@@ -868,7 +868,7 @@
CubicCurve2D curve = cctx.curve;
Graphics2D g2d = (Graphics2D) cctx.graphics;
g2d.translate(cctx.orgX, cctx.orgY);
- Color rCArray[] = cctx.colorlist;
+ Color[] rCArray = cctx.colorlist;
int ci = cctx.colorindex;
do {
curve.setCurve(x, y+size/2.0,
@@ -922,7 +922,7 @@
CubicCurve2D curve = cctx.curve;
Graphics2D g2d = (Graphics2D) cctx.graphics;
g2d.translate(cctx.orgX, cctx.orgY);
- Color rCArray[] = cctx.colorlist;
+ Color[] rCArray = cctx.colorlist;
int ci = cctx.colorindex;
do {
curve.setCurve(x, y+size/2.0,
@@ -970,7 +970,7 @@
Ellipse2D ellipse = cctx.ellipse;
Graphics2D g2d = (Graphics2D) cctx.graphics;
g2d.translate(cctx.orgX, cctx.orgY);
- Color rCArray[] = cctx.colorlist;
+ Color[] rCArray = cctx.colorlist;
int ci = cctx.colorindex;
do {
if (rCArray != null) {
@@ -1012,7 +1012,7 @@
Ellipse2D ellipse = cctx.ellipse;
Graphics2D g2d = (Graphics2D) cctx.graphics;
g2d.translate(cctx.orgX, cctx.orgY);
- Color rCArray[] = cctx.colorlist;
+ Color[] rCArray = cctx.colorlist;
int ci = cctx.colorindex;
do {
if (rCArray != null) {
--- a/src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/ui/EnableButton.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -57,7 +57,7 @@
private Group group;
private int type;
- public static final String icons[] = {
+ public static final String[] icons = {
"Set",
"Clear",
"Invert",
--- a/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -791,7 +791,7 @@
}
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
try {
SwingUtilities.invokeAndWait(new Runnable() {
--- a/src/demo/share/jfc/Font2DTest/Font2DTest.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/Font2DTest/Font2DTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -116,16 +116,16 @@
private JTextArea userTextArea;
private JDialog printDialog;
private JDialog fontInfoDialog;
- private LabelV2 fontInfos[] = new LabelV2[2];
+ private LabelV2[] fontInfos = new LabelV2[2];
private JFileChooser filePromptDialog = null;
private ButtonGroup printCBGroup;
- private JRadioButton printModeCBs[] = new JRadioButton[3];
+ private JRadioButton[] printModeCBs = new JRadioButton[3];
/// Status bar
private final LabelV2 statusBar;
- private int fontStyles [] = {Font.PLAIN, Font.BOLD, Font.ITALIC, Font.BOLD | Font.ITALIC};
+ private int[] fontStyles = {Font.PLAIN, Font.BOLD, Font.ITALIC, Font.BOLD | Font.ITALIC};
/// Text filename
private String tFileName;
@@ -289,7 +289,7 @@
parent.setJMenuBar( mb );
- String fontList[] =
+ String[] fontList =
GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
for ( int i = 0; i < fontList.length; i++ )
@@ -422,7 +422,7 @@
/// RangeMenu object signals using this function
/// when Unicode range has been changed and text needs to be redrawn
public void fireRangeChanged() {
- int range[] = rm.getSelectedRange();
+ int[] range = rm.getSelectedRange();
fp.setTextToDraw( fp.RANGE_TEXT, range, null, null );
if(canDisplayCheck) {
setupFontList(range[0], range[1]);
@@ -445,7 +445,7 @@
/// Updates the information about the selected font
public void fireUpdateFontInfo() {
if ( showFontInfoCBMI.getState() ) {
- String infos[] = fp.getFontInfo();
+ String[] infos = fp.getFontInfo();
for ( int i = 0; i < fontInfos.length; i++ )
fontInfos[i].setText( infos[i] );
fontInfoDialog.pack();
@@ -533,7 +533,7 @@
private String[] parseUserText( String orig ) {
int length = orig.length();
StringTokenizer perLine = new StringTokenizer( orig, "\n" );
- String textLines[] = new String[ perLine.countTokens() ];
+ String[] textLines = new String[ perLine.countTokens() ];
int lineNumber = 0;
while ( perLine.hasMoreElements() ) {
@@ -583,14 +583,15 @@
/// Then breaks the text into String array, delimited at every line break
private void readTextFile( String fileName ) {
try {
- String fileText, textLines[];
+ String fileText;
+ String[] textLines;
BufferedInputStream bis =
new BufferedInputStream( new FileInputStream( fileName ));
int numBytes = bis.available();
if (numBytes == 0) {
throw new Exception("Text file " + fileName + " is empty");
}
- byte byteData[] = new byte[ numBytes ];
+ byte[] byteData = new byte[ numBytes ];
bis.read( byteData, 0, numBytes );
bis.close();
@@ -648,7 +649,7 @@
BufferedOutputStream bos =
new BufferedOutputStream( new FileOutputStream( fileName ));
/// Prepend title and the option that is only obtainable here
- int range[] = rm.getSelectedRange();
+ int[] range = rm.getSelectedRange();
String completeOptions =
( "Font2DTest Option File\n" +
displayGridCBMI.getState() + "\n" +
@@ -656,7 +657,7 @@
showFontInfoCBMI.getState() + "\n" +
rm.getSelectedItem() + "\n" +
range[0] + "\n" + range[1] + "\n" + curOptions + tFileName);
- byte toBeWritten[] = completeOptions.getBytes( "UTF-16" );
+ byte[] toBeWritten = completeOptions.getBytes( "UTF-16" );
bos.write( toBeWritten, 0, toBeWritten.length );
bos.close();
}
@@ -714,7 +715,7 @@
BufferedInputStream bis =
new BufferedInputStream( new FileInputStream( fileName ));
int numBytes = bis.available();
- byte byteData[] = new byte[ numBytes ];
+ byte[] byteData = new byte[ numBytes ];
bis.read( byteData, 0, numBytes );
bis.close();
if ( numBytes < 2 ||
@@ -744,7 +745,7 @@
int antialiasOpt = Integer.parseInt(perLine.nextToken());
int fractionalOpt = Integer.parseInt(perLine.nextToken());
int lcdContrast = Integer.parseInt(perLine.nextToken());
- String userTextOpt[] = { "Font2DTest!" };
+ String[] userTextOpt = { "Font2DTest!" };
String dialogEntry = "Font2DTest!";
if (textToUseOpt == fp.USER_TEXT ) {
int numLines = perLine.countTokens(), lineNumber = 0;
@@ -1016,7 +1017,7 @@
}
/// Main function
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
if(argv.length > 0) {
if(argv[0].equalsIgnoreCase("-disablecandisplaycheck") ||
--- a/src/demo/share/jfc/Font2DTest/FontPanel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/Font2DTest/FontPanel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -95,14 +95,14 @@
public final class FontPanel extends JPanel implements AdjustmentListener {
/// Drawing Option Constants
- private final String STYLES[] =
+ private final String[] STYLES =
{ "plain", "bold", "italic", "bold italic" };
private final int NONE = 0;
private final int SCALE = 1;
private final int SHEAR = 2;
private final int ROTATE = 3;
- private final String TRANSFORMS[] =
+ private final String[] TRANSFORMS =
{ "with no transforms", "with scaling", "with Shearing", "with rotation" };
private final int DRAW_STRING = 0;
@@ -112,7 +112,7 @@
private final int TL_DRAW = 4;
private final int GV_OUTLINE = 5;
private final int TL_OUTLINE = 6;
- private final String METHODS[] = {
+ private final String[] METHODS = {
"drawString", "drawChars", "drawBytes", "drawGlyphVector",
"TextLayout.draw", "GlyphVector.getOutline", "TextLayout.getOutline" };
@@ -120,9 +120,9 @@
public final int ALL_GLYPHS = 1;
public final int USER_TEXT = 2;
public final int FILE_TEXT = 3;
- private final String MS_OPENING[] =
+ private final String[] MS_OPENING =
{ " Unicode ", " Glyph Code ", " lines ", " lines " };
- private final String MS_CLOSING[] =
+ private final String[] MS_CLOSING =
{ "", "", " of User Text ", " of LineBreakMeasurer-reformatted Text " };
/// General Graphics Variable
@@ -153,10 +153,10 @@
private Object lcdContrast = getDefaultLCDContrast();
private int drawMethod = DRAW_STRING;
private int textToUse = RANGE_TEXT;
- private String userText[] = null;
- private String fileText[] = null;
- private int drawRange[] = { 0x0000, 0x007f };
- private String fontInfos[] = new String[2];
+ private String[] userText = null;
+ private String[] fileText = null;
+ private int[] drawRange = { 0x0000, 0x007f };
+ private String[] fontInfos = new String[2];
private boolean showGrid = true;
/// Parent Font2DTest panel
@@ -271,8 +271,8 @@
fc.repaint();
}
- public void setTextToDraw( int i, int range[],
- String textSet[], String fileData[] ) {
+ public void setTextToDraw( int i, int[] range,
+ String[] textSet, String[] fileData ) {
textToUse = i;
if ( textToUse == RANGE_TEXT )
@@ -377,8 +377,8 @@
String name, float size, int style,
int transform, int g2transform,
int text, int method, int aa, int fm,
- int contrast, String user[] ) {
- int range[] = { start, end };
+ int contrast, String[] user ) {
+ int[] range = { start, end };
/// Since repaint call has a low priority, these functions will finish
/// before the actual repainting is done
@@ -458,7 +458,7 @@
private String backupStatusString = null;
/// Error constants
- private final String ERRORS[] = {
+ private final String[] ERRORS = {
"ERROR: drawBytes cannot handle characters beyond 0x00FF. Select different range or draw methods.",
"ERROR: Cannot fit text with the current font size. Resize the window or use smaller font size.",
"ERROR: Cannot print with the current font size. Use smaller font size.",
@@ -480,7 +480,7 @@
/// Creates an invisble pointer by giving it bogus image
/// Possibly find a workaround for this...
Toolkit tk = Toolkit.getDefaultToolkit();
- byte bogus[] = { (byte) 0 };
+ byte[] bogus = { (byte) 0 };
blankCursor =
tk.createCustomCursor( tk.createImage( bogus ), new Point(0, 0), "" );
@@ -545,8 +545,8 @@
public void modeSpecificDrawChar( Graphics2D g2, int charCode,
int baseX, int baseY ) {
GlyphVector gv;
- int oneGlyph[] = { charCode };
- char charArray[] = Character.toChars( charCode );
+ int[] oneGlyph = { charCode };
+ char[] charArray = Character.toChars( charCode );
FontRenderContext frc = g2.getFontRenderContext();
AffineTransform oldTX = g2.getTransform();
@@ -563,7 +563,7 @@
// we need to convert back to user space to be able to
// calculate the shift as baseX is in user space.
try {
- double pt[] = new double[4];
+ double[] pt = new double[4];
pt[0] = r2d2.getX();
pt[1] = r2d2.getY();
pt[2] = r2d2.getX()+r2d2.getWidth();
@@ -597,7 +597,7 @@
case DRAW_BYTES:
if ( charCode > 0xff )
throw new CannotDrawException( DRAW_BYTES_ERROR );
- byte oneByte[] = { (byte) charCode };
+ byte[] oneByte = { (byte) charCode };
g2.drawBytes( oneByte, 0, 1, 0, 0 );
break;
case DRAW_GLYPHV:
@@ -644,7 +644,7 @@
break;
case DRAW_BYTES:
try {
- byte lineBytes[] = line.getBytes( "ISO-8859-1" );
+ byte[] lineBytes = line.getBytes( "ISO-8859-1" );
g2.drawBytes( lineBytes, 0, lineBytes.length, 0, 0 );
}
catch ( Exception e ) {
@@ -934,7 +934,7 @@
oneLine.isLeftToRight() ?
canvasInset_X : ( (float) w - oneLine.getAdvance() - canvasInset_X );
- float fmData[] = {0, oneLine.getAscent(), 0, oneLine.getDescent(), 0, oneLine.getLeading()};
+ float[] fmData = {0, oneLine.getAscent(), 0, oneLine.getDescent(), 0, oneLine.getLeading()};
if (g2Transform != NONE) {
AffineTransform at = getAffineTransform(g2Transform);
at.transform( fmData, 0, fmData, 0, 3);
--- a/src/demo/share/jfc/J2Ddemo/java2d/CloningFeature.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/CloningFeature.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -161,7 +161,7 @@
return;
}
- Component cmps[] = dg.clonePanels[0].getComponents();
+ Component[] cmps = dg.clonePanels[0].getComponents();
for (int i = 0; i < cmps.length && thread != null; i++) {
if ((dp = (DemoPanel) cmps[i]).tools == null) {
continue;
--- a/src/demo/share/jfc/J2Ddemo/java2d/DemoGroup.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/DemoGroup.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -76,7 +76,7 @@
private final EmptyBorder emptyB = new EmptyBorder(5, 5, 5, 5);
private final BevelBorder bevelB = new BevelBorder(BevelBorder.LOWERED);
private String groupName;
- public JPanel clonePanels[];
+ public JPanel[] clonePanels;
public JTabbedPane tabbedPane;
public DemoGroup(String name, DemoInstVarsAccessor demoInstVars) {
@@ -234,9 +234,9 @@
Tools t = dp.tools;
t.setVisible(isValid());
t.issueRepaint = issueRepaint;
- JToggleButton b[] = { t.toggleB, t.aliasB, t.renderB,
+ JToggleButton[] b = { t.toggleB, t.aliasB, t.renderB,
t.textureB, t.compositeB };
- JCheckBox cb[] = { c.toolBarCB, c.aliasCB, c.renderCB,
+ JCheckBox[] cb = { c.toolBarCB, c.aliasCB, c.renderCB,
c.textureCB, c.compositeCB };
for (int j = 0; j < b.length; j++) {
if (c.obj != null && c.obj.equals(cb[j])) {
@@ -334,7 +334,7 @@
panel.revalidate();
}
- public static void main(String args[]) {
+ public static void main(String[] args) {
class DemoInstVarsAccessorImpl extends DemoInstVarsAccessorImplBase {
private volatile JCheckBoxMenuItem ccthreadCB;
--- a/src/demo/share/jfc/J2Ddemo/java2d/DemoPanel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/DemoPanel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -74,8 +74,8 @@
}
if (obj instanceof CustomControlsContext) {
ccc = (CustomControlsContext) obj;
- Component cmps[] = ccc.getControls();
- String cons[] = ccc.getConstraints();
+ Component[] cmps = ccc.getControls();
+ String[] cons = ccc.getConstraints();
for (int i = 0; i < cmps.length; i++) {
add(cmps[i], cons[i]);
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/Intro.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/Intro.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -157,7 +157,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
final Intro intro = new Intro();
WindowListener l = new WindowAdapter() {
@@ -497,7 +497,7 @@
Font f3 = new Font(Font.SERIF, Font.PLAIN, 72);
public Director(Surface surf) {
- Object partsInfo[][][] = {
+ Object[][][] partsInfo = {
{ { "J - scale text on gradient", "0" },
{ new GpE(GpE.BURI, myBlack, myBlue, 0, 20),
new TxE("J", f1, TxE.SCI, myYellow, 2, 20) } },
@@ -677,7 +677,7 @@
private int type;
private double rIncr, sIncr;
private double sx, sy, rotate;
- private Shape shapes[], txShapes[];
+ private Shape[] shapes, txShapes;
private int sw;
private int numRev;
private Paint paint;
@@ -1610,7 +1610,7 @@
static final Font font2 = new Font(Font.SERIF, Font.PLAIN, 24);
private final FontMetrics fm1;
private final FontMetrics fm2;
- private static final String table[][] = { { "Graphics", "Antialiased rendering",
+ private static final String[][] table = { { "Graphics", "Antialiased rendering",
"Bezier paths",
"Transforms", "Compositing", "Stroking parameters" },
{ "Text", "Extended font support",
@@ -1622,7 +1622,7 @@
"RenderableImage interface" },
{ "Color", "ICC profile support", "Color conversion",
"Arbitrary color spaces" } };
- private String list[];
+ private String[] list;
private int beginning, ending;
private int strH;
private int endIndex, listIndex;
@@ -1687,7 +1687,7 @@
*/
static class Contributors implements Part {
- private static final String members[] = {
+ private static final String[] members = {
"Brian Lichtenwalter", "Jeannette Hung",
"Thanh Nguyen", "Jim Graham", "Jerry Evans",
"John Raley", "Michael Peirce", "Robert Kim",
--- a/src/demo/share/jfc/J2Ddemo/java2d/J2Ddemo.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/J2Ddemo.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -678,7 +678,7 @@
}
- public static void main(final String args[]) {
+ public static void main(final String[] args) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
--- a/src/demo/share/jfc/J2Ddemo/java2d/MemoryMonitor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/MemoryMonitor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -125,7 +125,7 @@
private Font font = new Font(Font.SERIF, Font.PLAIN, 11);
private Runtime r = Runtime.getRuntime();
private int columnInc;
- private int pts[];
+ private int[] pts;
private int ptNum;
private int ascent, descent;
private Rectangle graphOutlineRect = new Rectangle();
@@ -247,7 +247,7 @@
pts = new int[graphW];
ptNum = 0;
} else if (pts.length != graphW) {
- int tmp[] = null;
+ int[] tmp = null;
if (ptNum < graphW) {
tmp = new int[ptNum];
System.arraycopy(pts, 0, tmp, 0, tmp.length);
@@ -337,7 +337,7 @@
}
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
final MemoryMonitor demo = new MemoryMonitor();
WindowListener l = new WindowAdapter() {
--- a/src/demo/share/jfc/J2Ddemo/java2d/TextureChooser.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/TextureChooser.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -224,7 +224,7 @@
}
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
Frame f = new Frame("J2D Demo - TextureChooser");
f.addWindowListener(new WindowAdapter() {
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/Arcs.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/Arcs.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@
@SuppressWarnings("serial")
public class Arcs extends AnimatingSurface {
- private static String types[] = { "Arc2D.OPEN", "Arc2D.CHORD", "Arc2D.PIE" };
+ private static String[] types = { "Arc2D.OPEN", "Arc2D.CHORD", "Arc2D.PIE" };
private static final int CLOSE = 0;
private static final int OPEN = 1;
private static final int FORWARD = 0;
@@ -159,7 +159,7 @@
g2.fill(at.createTransformedShape(pieArc));
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Arcs());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/BezierAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/BezierAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -74,8 +74,8 @@
protected BasicStroke dashed = new BasicStroke(10.0f,
BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 10, new float[] { 5 },
0);
- private float animpts[] = new float[NUMPTS * 2];
- private float deltas[] = new float[NUMPTS * 2];
+ private float[] animpts = new float[NUMPTS * 2];
+ private float[] deltas = new float[NUMPTS * 2];
protected Paint fillPaint, drawPaint;
protected boolean doFill = true;
protected boolean doDraw = true;
@@ -173,7 +173,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new BezierAnim());
}
@@ -194,21 +194,21 @@
tp2 = new TexturePaint(bi, new Rectangle(0, 0, 2, 1));
}
BezierAnim demo;
- static Paint drawPaints[] = { new Color(0, 0, 0, 0), BLUE, new Color(0,
+ static Paint[] drawPaints = { new Color(0, 0, 0, 0), BLUE, new Color(0,
0, 255, 126),
BLUE, tp2 };
- static String drawName[] = { "No Draw", "Blue", "Blue w/ Alpha",
+ static String[] drawName = { "No Draw", "Blue", "Blue w/ Alpha",
"Blue Dash", "Texture" };
- static Paint fillPaints[] = { new Color(0, 0, 0, 0), GREEN, new Color(0,
+ static Paint[] fillPaints = { new Color(0, 0, 0, 0), GREEN, new Color(0,
255, 0, 126),
tp1, new GradientPaint(0, 0, RED, 30, 30, YELLOW) };
- String fillName[] = { "No Fill", "Green", "Green w/ Alpha", "Texture",
+ String[] fillName = { "No Fill", "Green", "Green w/ Alpha", "Texture",
"Gradient" };
JMenu fillMenu, drawMenu;
- JMenuItem fillMI[] = new JMenuItem[fillPaints.length];
- JMenuItem drawMI[] = new JMenuItem[drawPaints.length];
- PaintedIcon fillIcons[] = new PaintedIcon[fillPaints.length];
- PaintedIcon drawIcons[] = new PaintedIcon[drawPaints.length];
+ JMenuItem[] fillMI = new JMenuItem[fillPaints.length];
+ JMenuItem[] drawMI = new JMenuItem[drawPaints.length];
+ PaintedIcon[] fillIcons = new PaintedIcon[fillPaints.length];
+ PaintedIcon[] drawIcons = new PaintedIcon[drawPaints.length];
Font font = new Font(Font.SERIF, Font.PLAIN, 10);
@SuppressWarnings("LeakingThisInConstructor")
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/Curves.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/Curves.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -52,7 +52,7 @@
@SuppressWarnings("serial")
public class Curves extends Surface {
- private static Color colors[] = { BLUE, GREEN, RED };
+ private static Color[] colors = { BLUE, GREEN, RED };
public Curves() {
setBackground(WHITE);
@@ -136,7 +136,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Curves());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/Ellipses.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Arcs_Curves/Ellipses.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -44,12 +44,12 @@
@SuppressWarnings("serial")
public final class Ellipses extends AnimatingSurface {
- private static Color colors[] = {
+ private static Color[] colors = {
BLUE, CYAN, GREEN, MAGENTA, ORANGE, PINK, RED,
YELLOW, LIGHT_GRAY, WHITE };
private Ellipse2D.Float[] ellipses;
- private double esize[];
- private float estroke[];
+ private double[] esize;
+ private float[] estroke;
private double maxSize;
public Ellipses() {
@@ -102,7 +102,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Ellipses());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/Areas.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/Areas.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -141,7 +141,7 @@
g2.draw(area);
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Areas());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/ClipAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/ClipAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -61,7 +61,7 @@
big.fillRect(0, 0, 3, 3);
texturePaint = new TexturePaint(bi, new Rectangle(0, 0, 5, 5));
}
- private AnimVal animval[] = new AnimVal[3];
+ private AnimVal[] animval = new AnimVal[3];
protected boolean doObjects = true;
private Font originalFont = new Font(Font.SERIF, Font.PLAIN, 12);
private Font font;
@@ -158,7 +158,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new ClipAnim());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/Intersection.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/Intersection.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -171,7 +171,7 @@
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Intersection());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/Text.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Clipping/Text.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -161,7 +161,7 @@
g2.draw(shape);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Text());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Colors/BullsEye.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Colors/BullsEye.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -53,7 +53,7 @@
@Override
public void render(int w, int h, Graphics2D g2) {
- Color reds[] = { RED.darker(), RED };
+ Color[] reds = { RED.darker(), RED };
for (int N = 0; N < 18; N++) {
float i = (N + 2) / 2.0f;
float x = (5 + i * (w / 2 / 10));
@@ -70,7 +70,7 @@
}
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new BullsEye());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Colors/ColorConvert.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Colors/ColorConvert.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -65,7 +65,7 @@
public class ColorConvert extends Surface {
private static Image img;
- private static Color colors[] = { red, pink, orange,
+ private static Color[] colors = { red, pink, orange,
yellow, green, magenta, cyan, blue };
public ColorConvert() {
@@ -123,7 +123,7 @@
g2.drawImage(dstImg, w / 2 + 10, 20, w / 2 - 20, h - 30, null);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new ColorConvert());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Colors/Rotator3D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Colors/Rotator3D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -50,7 +50,7 @@
@SuppressWarnings("serial")
public class Rotator3D extends AnimatingSurface {
- private Objects3D objs[] = new Objects3D[3];
+ private Objects3D[] objs = new Objects3D[3];
private static final int[][][] polygons = {
// Solid cube
{ { 5, 1, 15, 13, 21, 23, 15 },
@@ -142,7 +142,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Rotator3D());
}
@@ -170,8 +170,8 @@
private double ix = 3.0, iy = 3.0;
private double[][] rotPts;
private int[][] scrPts;
- private int xx[] = new int[20];
- private int yy[] = new int[20];
+ private int[] xx = new int[20];
+ private int[] yy = new int[20];
private double x, y;
private int p, j;
private int colour;
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Composite/ACimages.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Composite/ACimages.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -61,11 +61,11 @@
@SuppressWarnings("serial")
public class ACimages extends Surface {
- private static final String s[] = { "box", "fight", "magnify",
+ private static final String[] s = { "box", "fight", "magnify",
"boxwave", "globe", "snooze",
"tip", "thumbsup", "dukeplug" };
- private static Image imgs[] = new Image[s.length];
- private static Color colors[] = { BLUE, CYAN, GREEN,
+ private static Image[] imgs = new Image[s.length];
+ private static Color[] colors = { BLUE, CYAN, GREEN,
MAGENTA, ORANGE, PINK, RED, YELLOW, LIGHT_GRAY };
public ACimages() {
@@ -121,7 +121,7 @@
}
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new ACimages());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Composite/ACrules.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Composite/ACrules.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -64,7 +64,7 @@
@SuppressWarnings("serial")
public class ACrules extends AnimatingSurface {
- private static String compNames[] = {
+ private static String[] compNames = {
"Src",
"SrcOver",
"SrcIn",
@@ -77,17 +77,17 @@
"DstOut",
"DstAtop",
"Xor", };
- private static final AlphaComposite compObjs[] = {
+ private static final AlphaComposite[] compObjs = {
Src, SrcOver, SrcIn, SrcOut, SrcAtop, Clear,
Dst, DstOver, DstIn, DstOut, DstAtop, Xor, };
private static final int NUM_RULES = compObjs.length;
private static final int HALF_NUM_RULES = NUM_RULES / 2;
private int fadeIndex;
- private static float fadeValues[][] = {
+ private static float[][] fadeValues = {
{ 1.0f, -0.1f, 0.0f, 1.0f, 0.0f, 1.0f },
{ 0.0f, 0.1f, 1.0f, 1.0f, -0.1f, 0.0f },
{ 1.0f, 0.0f, 1.0f, 0.0f, 0.1f, 1.0f }, };
- private static String fadeNames[] = {
+ private static String[] fadeNames = {
"Src => transparent, Dest opaque",
"Src => opaque, Dest => transparent",
"Src opaque, Dest => opaque", };
@@ -257,7 +257,7 @@
return bi;
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new ACrules());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Composite/FadeAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Composite/FadeAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -107,18 +107,18 @@
texturePaint = new TexturePaint(bi, new Rectangle(0, 0, w, h));
}
private static BasicStroke bs = new BasicStroke(6);
- private static Font fonts[] = {
+ private static Font[] fonts = {
new Font(Font.SERIF, Font.PLAIN, 64),
new Font(Font.SERIF, Font.BOLD | Font.ITALIC, 24),
new Font(Font.MONOSPACED, Font.BOLD, 36),
new Font(Font.SANS_SERIF, Font.BOLD | Font.ITALIC, 48),
new Font(Font.SANS_SERIF, Font.PLAIN, 52) };
- private static String strings[] = {
+ private static String[] strings = {
"Alpha", "Composite", "Src", "SrcOver",
"SrcIn", "SrcOut", "Clear", "DstOver", "DstIn" };
- private static String imgs[] = {
+ private static String[] imgs = {
"jumptojavastrip.png", "duke.png", "star7.png" };
- private static Paint paints[] = {
+ private static Paint[] paints = {
RED, BLUE, GREEN, MAGENTA,
ORANGE, PINK, CYAN, texturePaint,
YELLOW, LIGHT_GRAY, WHITE };
@@ -276,7 +276,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new FadeAnim());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/AllFonts.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/AllFonts.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -125,7 +125,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new AllFonts());
}
@@ -135,9 +135,9 @@
AllFonts demo;
JSlider slider;
- int fsize[] = { 8, 14, 18, 24 };
- JMenuItem menuitem[] = new JMenuItem[fsize.length];
- Font font[] = new Font[fsize.length];
+ int[] fsize = { 8, 14, 18, 24 };
+ JMenuItem[] menuitem = new JMenuItem[fsize.length];
+ Font[] font = new Font[fsize.length];
@SuppressWarnings("LeakingThisInConstructor")
public DemoControls(AllFonts demo) {
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/AttributedStr.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/AttributedStr.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -184,7 +184,7 @@
}
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new AttributedStr());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Highlighting.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Highlighting.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -55,8 +55,8 @@
@SuppressWarnings("serial")
public class Highlighting extends AnimatingSurface {
- private static String text[] = { "HIGHLIGHTING", "OpenJDK" };
- private static Color colors[] = { CYAN, LIGHT_GRAY };
+ private static String[] text = { "HIGHLIGHTING", "OpenJDK" };
+ private static Color[] colors = { CYAN, LIGHT_GRAY };
private static Font smallF = new Font("Monospaced", Font.PLAIN, 8);
private int[] curPos;
private TextLayout[] layouts;
@@ -129,7 +129,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Highlighting());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Outline.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Outline.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -109,7 +109,7 @@
g2.fill(sha);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Outline());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Tree.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Tree.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -90,7 +90,7 @@
static double Twidth = 0.6;
static double Rwidth = 0.6;
static double FontHeight = 0.75;
- static Color colors[] = { BLUE,
+ static Color[] colors = { BLUE,
RED.darker(),
GREEN.darker() };
@@ -123,7 +123,7 @@
g2d.setTransform(new AffineTransform());
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Tree());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/DukeAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/DukeAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -91,7 +91,7 @@
return isShowing();
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new DukeAnim());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/ImageOps.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/ImageOps.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,12 +66,12 @@
public class ImageOps extends ControlsSurface implements ChangeListener {
protected JSlider slider1, slider2;
- private static final String imgName[] = { "bld.jpg", "boat.png" };
- private static final BufferedImage img[] = new BufferedImage[imgName.length];
- private static final String opsName[] = {
+ private static final String[] imgName = { "bld.jpg", "boat.png" };
+ private static final BufferedImage[] img = new BufferedImage[imgName.length];
+ private static final String[] opsName = {
"Threshold", "RescaleOp", "Invert", "Yellow Invert", "3x3 Blur",
"3x3 Sharpen", "3x3 Edge", "5x5 Edge" };
- private static final BufferedImageOp biop[] =
+ private static final BufferedImageOp[] biop =
new BufferedImageOp[opsName.length];
private static int rescaleFactor = 128;
private static float rescaleOffset = 0;
@@ -82,8 +82,8 @@
thresholdOp(low, high);
int i = 1;
biop[i++] = new RescaleOp(1.0f, 0, null);
- byte invert[] = new byte[256];
- byte ordered[] = new byte[256];
+ byte[] invert = new byte[256];
+ byte[] ordered = new byte[256];
for (int j = 0; j < 256; j++) {
invert[j] = (byte) (256 - j);
ordered[j] = (byte) j;
@@ -91,8 +91,8 @@
biop[i++] = new LookupOp(new ByteLookupTable(0, invert), null);
byte[][] yellowInvert = new byte[][] { invert, invert, ordered };
biop[i++] = new LookupOp(new ByteLookupTable(0, yellowInvert), null);
- int dim[][] = { { 3, 3 }, { 3, 3 }, { 3, 3 }, { 5, 5 } };
- float data[][] = { { 0.1f, 0.1f, 0.1f, // 3x3 blur
+ int[][] dim = { { 3, 3 }, { 3, 3 }, { 3, 3 }, { 5, 5 } };
+ float[][] data = { { 0.1f, 0.1f, 0.1f, // 3x3 blur
0.1f, 0.2f, 0.1f,
0.1f, 0.1f, 0.1f },
{ -1.0f, -1.0f, -1.0f, // 3x3 sharpen
@@ -134,7 +134,7 @@
}
public static void thresholdOp(int low, int high) {
- byte threshold[] = new byte[256];
+ byte[] threshold = new byte[256];
for (int j = 0; j < 256; j++) {
if (j > high) {
threshold[j] = (byte) 255;
@@ -180,7 +180,7 @@
repaint();
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new ImageOps());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/JPEGFlip.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/JPEGFlip.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -176,7 +176,7 @@
g2.drawLine(0, hh, w, hh);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new JPEGFlip());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/WarpImage.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Images/WarpImage.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -51,7 +51,7 @@
private static Image img;
private static final int FORWARD = 0;
private static final int BACK = 1;
- private Point2D pts[];
+ private Point2D[] pts;
private int direction = FORWARD;
private int pNum;
private int x, y;
@@ -73,7 +73,7 @@
CubicCurve2D cc = new CubicCurve2D.Float(
w * .2f, h * .5f, w * .4f, 0, w * .6f, h, w * .8f, h * .5f);
PathIterator pi = cc.getPathIterator(null, 0.1);
- Point2D tmp[] = new Point2D[200];
+ Point2D[] tmp = new Point2D[200];
int i = 0;
while (!pi.isDone()) {
float[] coords = new float[6];
@@ -128,7 +128,7 @@
this);
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new WarpImage());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/Caps.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/Caps.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -53,8 +53,8 @@
@SuppressWarnings("serial")
public class Caps extends Surface {
- private static int cap[] = { CAP_BUTT, CAP_ROUND, CAP_SQUARE };
- private static String desc[] = { "Butt Cap", "Round Cap", "Square Cap" };
+ private static int[] cap = { CAP_BUTT, CAP_ROUND, CAP_SQUARE };
+ private static String[] desc = { "Butt Cap", "Round Cap", "Square Cap" };
public Caps() {
setBackground(WHITE);
@@ -75,7 +75,7 @@
}
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Caps());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/Dash.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/Dash.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -76,11 +76,11 @@
int x = 0;
int y = h - 34;
- BasicStroke bs[] = new BasicStroke[6];
+ BasicStroke[] bs = new BasicStroke[6];
float j = 1.1f;
for (int i = 0; i < bs.length; i++, j += 1.0f) {
- float dash[] = { j };
+ float[] dash = { j };
BasicStroke b = new BasicStroke(1.0f, BasicStroke.CAP_BUTT,
BasicStroke.JOIN_MITER, 10.0f, dash, 0.0f);
g2.setStroke(b);
@@ -128,7 +128,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Dash());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/Joins.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/Joins.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -113,7 +113,7 @@
g2.draw(bs.createStrokedShape(p));
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Joins());
}
@@ -121,12 +121,12 @@
class DemoControls extends CustomControls implements ActionListener {
Joins demo;
- int joinType[] = { BasicStroke.JOIN_MITER,
+ int[] joinType = { BasicStroke.JOIN_MITER,
BasicStroke.JOIN_ROUND, BasicStroke.JOIN_BEVEL };
- String joinName[] = { "Mitered Join", "Rounded Join", "Beveled Join" };
+ String[] joinName = { "Mitered Join", "Rounded Join", "Beveled Join" };
JMenu menu;
- JMenuItem menuitem[] = new JMenuItem[joinType.length];
- JoinIcon icons[] = new JoinIcon[joinType.length];
+ JMenuItem[] menuitem = new JMenuItem[joinType.length];
+ JoinIcon[] icons = new JoinIcon[joinType.length];
JToolBar toolbar;
@SuppressWarnings("LeakingThisInConstructor")
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/LineAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Lines/LineAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -55,18 +55,18 @@
@SuppressWarnings("serial")
public class LineAnim extends AnimatingSurface {
- private static int caps[] = { BasicStroke.CAP_BUTT,
+ private static int[] caps = { BasicStroke.CAP_BUTT,
BasicStroke.CAP_SQUARE, BasicStroke.CAP_ROUND };
- private static int joins[] = { BasicStroke.JOIN_MITER,
+ private static int[] joins = { BasicStroke.JOIN_MITER,
BasicStroke.JOIN_BEVEL, BasicStroke.JOIN_ROUND };
- private static Color colors[] = { GRAY, PINK, LIGHT_GRAY };
+ private static Color[] colors = { GRAY, PINK, LIGHT_GRAY };
private static BasicStroke bs1 = new BasicStroke(1.0f);
private static final int CLOCKWISE = 0;
- private Line2D lines[] = new Line2D[3];
- private int rAmt[] = new int[lines.length];
- private int direction[] = new int[lines.length];
- private int speed[] = new int[lines.length];
- private BasicStroke strokes[] = new BasicStroke[lines.length];
+ private Line2D[] lines = new Line2D[3];
+ private int[] rAmt = new int[lines.length];
+ private int[] direction = new int[lines.length];
+ private int[] speed = new int[lines.length];
+ private BasicStroke[] strokes = new BasicStroke[lines.length];
private GeneralPath path;
private Point2D[] pts;
private float size;
@@ -158,7 +158,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new LineAnim());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Mix/Balls.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Mix/Balls.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -65,11 +65,11 @@
@SuppressWarnings("serial")
public class Balls extends AnimatingControlsSurface {
- private static Color colors[] = { RED, ORANGE, YELLOW, GREEN.darker(), BLUE,
+ private static Color[] colors = { RED, ORANGE, YELLOW, GREEN.darker(), BLUE,
new Color(75, 00, 82), new Color(238, 130, 238) };
private long now, deltaT, lasttime;
private boolean active;
- protected Ball balls[] = new Ball[colors.length];
+ protected Ball[] balls = new Ball[colors.length];
protected boolean clearToggle;
protected JComboBox combo;
@@ -129,7 +129,7 @@
lasttime = now;
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Balls());
}
@@ -141,7 +141,7 @@
public float x, y;
public float Vx = 0.1f;
public float Vy = 0.05f;
- public BufferedImage imgs[];
+ public BufferedImage[] imgs;
// Pick a random starting image index, but not the last: we're going UP
// and that would throw us off the end.
public int index = (int) (random() * (nImgs - 1));
@@ -182,11 +182,11 @@
imgs = new BufferedImage[nImgs];
int bg = 255;
- byte red[] = new byte[256];
+ byte[] red = new byte[256];
red[0] = (byte) bg;
- byte green[] = new byte[256];
+ byte[] green = new byte[256];
green[0] = (byte) bg;
- byte blue[] = new byte[256];
+ byte[] blue = new byte[256];
blue[0] = (byte) bg;
for (int r = 0; r < imgs.length; r++) {
@@ -202,7 +202,7 @@
IndexColorModel icm = new IndexColorModel(8, maxr + 1,
red, green, blue, 0);
DataBufferByte dbb = new DataBufferByte(data, data.length);
- int bandOffsets[] = { 0 };
+ int[] bandOffsets = { 0 };
WritableRaster wr = Raster.createInterleavedRaster(dbb,
R * 2, R * 2, R * 2, 1, bandOffsets, null);
imgs[r] = new BufferedImage(icm, wr, icm.isAlphaPremultiplied(),
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Mix/BezierScroller.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Mix/BezierScroller.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -72,7 +72,7 @@
@SuppressWarnings("serial")
public class BezierScroller extends AnimatingControlsSurface {
- private static String appletStrs[] = { " ", "J2Ddemo",
+ private static String[] appletStrs = { " ", "J2Ddemo",
"BezierScroller - Animated Bezier Curve shape with images",
"For README.txt file scrolling run in application mode", " " };
private static final int NUMPTS = 6;
@@ -84,8 +84,8 @@
private static BufferedImage img;
private static final int UP = 0;
private static final int DOWN = 1;
- private float animpts[] = new float[NUMPTS * 2];
- private float deltas[] = new float[NUMPTS * 2];
+ private float[] animpts = new float[NUMPTS * 2];
+ private float[] deltas = new float[NUMPTS * 2];
private BufferedReader reader;
private int nStrs;
private int strH;
@@ -293,7 +293,7 @@
g2.fill(gp);
PathIterator pi = gp.getPathIterator(null);
- float pts[] = new float[6];
+ float[] pts = new float[6];
while (!pi.isDone()) {
if (pi.currentSegment(pts) == PathIterator.SEG_CUBICTO) {
g2.drawImage(hotj_img, (int) pts[0], (int) pts[1], this);
@@ -310,7 +310,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new BezierScroller());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Mix/Stars3D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Mix/Stars3D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -67,7 +67,7 @@
@SuppressWarnings("serial")
public class Stars3D extends ControlsSurface {
- private static Color colors[] = { RED, GREEN, WHITE };
+ private static Color[] colors = { RED, GREEN, WHITE };
private static AffineTransform at = AffineTransform.getTranslateInstance(-5,
-5);
private Shape shape, tshape;
@@ -99,8 +99,8 @@
tshape = at.createTransformedShape(shape);
PathIterator pi = shape.getPathIterator(null);
- float seg[] = new float[6];
- float tseg[] = new float[6];
+ float[] seg = new float[6];
+ float[] tseg = new float[6];
GeneralPath working = new GeneralPath(Path2D.WIND_NON_ZERO);
float x = 0, y = 0; // Current point on the path
@@ -247,7 +247,7 @@
g2.draw(shape);
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new Stars3D());
}
@@ -306,8 +306,8 @@
return;
}
int length = getSize().width / 4;
- int size[] = { length, length };
- String str[] = { "OpenJDK", "J2D" };
+ int[] size = { length, length };
+ String[] str = { "OpenJDK", "J2D" };
while (thread == me) {
for (int i = 0; i < str.length; i++) {
demo.fontSize = size[i];
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/GradAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/GradAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -258,7 +258,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new GradAnim());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/Gradient.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/Gradient.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -93,7 +93,7 @@
(int) (h / 2 + tl.getBounds().getHeight() / 2));
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Gradient());
}
@@ -101,13 +101,13 @@
static class DemoControls extends CustomControls implements ActionListener {
Gradient demo;
- Color colors[] = { red, orange, yellow, green, blue, lightGray, cyan,
+ Color[] colors = { red, orange, yellow, green, blue, lightGray, cyan,
magenta };
- String colorName[] = { "Red", "Orange", "Yellow", "Green",
+ String[] colorName = { "Red", "Orange", "Yellow", "Green",
"Blue", "lightGray", "Cyan", "Magenta" };
- JMenuItem innerMI[] = new JMenuItem[colors.length];
- JMenuItem outerMI[] = new JMenuItem[colors.length];
- ColoredSquare squares[] = new ColoredSquare[colors.length];
+ JMenuItem[] innerMI = new JMenuItem[colors.length];
+ JMenuItem[] outerMI = new JMenuItem[colors.length];
+ ColoredSquare[] squares = new ColoredSquare[colors.length];
JMenu imenu, omenu;
@SuppressWarnings("LeakingThisInConstructor")
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/Texture.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/Texture.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -166,7 +166,7 @@
g2.fill(sha);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Texture());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/TextureAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paint/TextureAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -80,7 +80,7 @@
private boolean sheary = false;
private boolean showanchor = true;
private AnimVal w, h, x, y, rot, shx, shy;
- private static Image img[] = new Image[2];
+ private static Image[] img = new Image[2];
public TextureAnim() {
img[0] = getImage("duke.gif"); // 8 bit gif
@@ -218,7 +218,7 @@
}
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new TextureAnim());
}
@@ -301,7 +301,7 @@
JToolBar toolbar;
JComboBox combo;
JMenu menu;
- JMenuItem menuitems[];
+ JMenuItem[] menuitems;
int iconSize = 20;
ButtonBorder buttonBorder = new ButtonBorder();
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/Append.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/Append.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -77,7 +77,7 @@
g2.drawString("Append, connect", (int) (w * .25), (int) (h * .6) - 5);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Append());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/CurveQuadTo.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/CurveQuadTo.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -66,7 +66,7 @@
g2.drawString("quadTo", (int) (w * .2), (int) (h * .6f) - 5);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new CurveQuadTo());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/FillStroke.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/FillStroke.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -69,7 +69,7 @@
tl.draw(g2, (float) (w / 2 - tl.getBounds().getWidth() / 2), h * .85f);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new FillStroke());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/WindingRule.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Paths/WindingRule.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -86,7 +86,7 @@
g2.drawString("EVEN_ODD rule", 0, -5);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new WindingRule());
}
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Transforms/Rotate.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Transforms/Rotate.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -99,7 +99,7 @@
g2.drawString("Rotate", 5, 15);
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
createDemoFrame(new Rotate());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Transforms/SelectTx.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Transforms/SelectTx.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -232,7 +232,7 @@
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new SelectTx());
}
--- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Transforms/TransformAnim.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Transforms/TransformAnim.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -107,16 +107,16 @@
}
private static BasicStroke bs = new BasicStroke(6);
- private static Font fonts[] = {
+ private static Font[] fonts = {
new Font(Font.SERIF, PLAIN, 48),
new Font(Font.SERIF, BOLD|ITALIC, 24),
new Font(Font.MONOSPACED, BOLD, 36),
new Font(Font.SANS_SERIF, BOLD|ITALIC, 64),
new Font(Font.SANS_SERIF, PLAIN, 52)};
- private static String strings[] = {
+ private static String[] strings = {
"Transformation", "Rotate", "Translate", "Shear", "Scale" };
- private static String imgs[] = { "duke.png" };
- private static Paint paints[] = {
+ private static String[] imgs = { "duke.png" };
+ private static Paint[] paints = {
RED, BLUE, texturePaint, GREEN, MAGENTA, ORANGE, PINK, CYAN,
new Color(0, 255, 0, 128), new Color(0, 0, 255, 128),
YELLOW, LIGHT_GRAY, WHITE};
@@ -253,7 +253,7 @@
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
createDemoFrame(new TransformAnim());
}
--- a/src/demo/share/jfc/SampleTree/SampleTree.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/SampleTree/SampleTree.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -615,7 +615,7 @@
}
} // End of class SampleTree.TreeEditableChangeListener
- public static void main(String args[]) {
+ public static void main(String[] args) {
try {
SwingUtilities.invokeAndWait(new Runnable() {
--- a/src/demo/share/jfc/SwingSet2/BezierAnimationPanel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/SwingSet2/BezierAnimationPanel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -64,11 +64,11 @@
public final int NUMPTS = 6;
- float animpts[] = new float[NUMPTS * 2];
+ float[] animpts = new float[NUMPTS * 2];
- float deltas[] = new float[NUMPTS * 2];
+ float[] deltas = new float[NUMPTS * 2];
- float staticpts[] = {
+ float[] staticpts = {
50.0f, 0.0f,
150.0f, 0.0f,
200.0f, 75.0f,
@@ -77,7 +77,7 @@
0.0f, 75.0f,
};
- float movepts[] = new float[staticpts.length];
+ float[] movepts = new float[staticpts.length];
BufferedImage img;
--- a/src/demo/share/jfc/SwingSet2/ListDemo.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/SwingSet2/ListDemo.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -350,7 +350,7 @@
}
}
- ImageIcon images[] = new ImageIcon[7];
+ ImageIcon[] images = new ImageIcon[7];
void loadImages() {
images[0] = createImageIcon("list/red.gif", getString("ListDemo.red"));
images[1] = createImageIcon("list/blue.gif", getString("ListDemo.blue"));
--- a/src/demo/share/jfc/SwingSet2/TabbedPaneDemo.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/SwingSet2/TabbedPaneDemo.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -149,19 +149,19 @@
class HeadSpin extends JComponent implements ActionListener {
javax.swing.Timer animator;
- ImageIcon icon[] = new ImageIcon[6];
+ ImageIcon[] icon = new ImageIcon[6];
int tmpScale;
static final int numImages = 6;
- double x[] = new double[numImages];
- double y[] = new double[numImages];
+ double[] x = new double[numImages];
+ double[] y = new double[numImages];
- int xh[] = new int[numImages];
- int yh[] = new int[numImages];
+ int[] xh = new int[numImages];
+ int[] yh = new int[numImages];
- double scale[] = new double[numImages];
+ double[] scale = new double[numImages];
public HeadSpin() {
setBackground(Color.black);
--- a/src/demo/share/jfc/TableExample/TableExample.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/TableExample/TableExample.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -248,7 +248,7 @@
return scrollpane;
}
- public static void main(String s[]) {
+ public static void main(String[] s) {
// Trying to set Nimbus look and feel
try {
for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
--- a/src/demo/share/jfc/TableExample/TableSorter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/demo/share/jfc/TableExample/TableSorter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -71,7 +71,7 @@
@SuppressWarnings("serial")
public final class TableSorter extends TableMap {
- int indexes[];
+ int[] indexes;
List<Integer> sortingColumns = new ArrayList<Integer>();
boolean ascending = true;
int compares;
@@ -249,7 +249,7 @@
// arrays. The number of compares appears to vary between N-1 and
// NlogN depending on the initial order but the main reason for
// using it here is that, unlike qsort, it is stable.
- public void shuttlesort(int from[], int to[], int low, int high) {
+ public void shuttlesort(int[] from, int[] to, int low, int high) {
if (high - low < 2) {
return;
}
--- a/src/java.base/macosx/classes/module-info.java.extra Tue Oct 23 17:01:48 2018 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-exports jdk.internal.loader to java.desktop;
--- a/src/java.base/macosx/native/libjli/java_md_macosx.m Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.base/macosx/native/libjli/java_md_macosx.m Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -761,7 +761,7 @@
* Note there is a callback on this function from the splashscreen logic,
* this as well SetJavaVMValue() needs to be simplified.
*/
-JavaVM*
+JNIEXPORT JavaVM* JNICALL
JLI_GetJavaVMInstance()
{
return jvmInstance;
--- a/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java Wed Oct 24 13:35:18 2018 +0530
@@ -188,7 +188,7 @@
// to insure that it cannot be overridden by client subclasses.
// DO NOT INVOKE CLIENT CODE ON THIS THREAD!
void dispatchComposedText(String chgText,
- int chgStyles[],
+ int[] chgStyles,
int chgOffset,
int chgLength,
int caretPosition,
--- a/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c Wed Oct 24 13:35:18 2018 +0530
@@ -1148,6 +1148,7 @@
tmpstyle[cnt] = text->feedback[cnt];
(*env)->SetIntArrayRegion(env, style, 0,
text->length, (jint *)tmpstyle);
+ free(tmpstyle);
}
}
}
--- a/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java Wed Oct 24 13:35:18 2018 +0530
@@ -110,7 +110,7 @@
public static int OSTypeToInt(String type) {
int result = 0;
- byte b[] = { (byte) 0, (byte) 0, (byte) 0, (byte) 0 };
+ byte[] b = { (byte) 0, (byte) 0, (byte) 0, (byte) 0 };
int len = type.length();
if (len > 0) {
if (len > 4) len = 4;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -1420,7 +1420,7 @@
}
// One sort state for each column. Both are ascending by default
- final boolean fSortAscending[] = {true, true};
+ final boolean[] fSortAscending = {true, true};
// Instead of dragging, it selects which one to sort by
public void setDraggedColumn(final TableColumn aColumn) {
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -53,7 +53,7 @@
Vector<File> directories = null;
int fetchID = 0;
- private final boolean fSortAscending[] = {true, true};
+ private final boolean[] fSortAscending = {true, true};
// private boolean fSortAscending = true;
private boolean fSortNames = true;
private final String[] fColumnNames;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaLookAndFeel.java Wed Oct 24 13:35:18 2018 +0530
@@ -274,7 +274,7 @@
// <rdar://problem/5189013> Entire Java application window refreshes when moving off Shortcut menu item
final Boolean useOpaqueComponents = Boolean.TRUE;
- final Boolean buttonShouldBeOpaque = AquaUtils.shouldUseOpaqueButtons() ? Boolean.TRUE : Boolean.FALSE;
+ final Boolean buttonShouldBeOpaque = Boolean.FALSE;
// *** List value objects
final Object listCellRendererActiveValue = new UIDefaults.ActiveValue(){
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -37,7 +37,7 @@
// TODO: no screen menu bar for now
public class AquaMenuItemUI extends BasicMenuItemUI implements AquaMenuPainter.Client/*, ScreenMenuItemUI*/ {
static final int kPlain = 0, kCheckBox = 1, kRadioButton = 2;
- static final String sPropertyPrefixes[] = { "MenuItem", "CheckBoxMenuItem", "RadioButtonMenuItem" };
+ static final String[] sPropertyPrefixes = { "MenuItem", "CheckBoxMenuItem", "RadioButtonMenuItem" };
boolean fIsScreenMenuItem = false;
boolean fIsIndeterminate = false;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -96,14 +96,14 @@
if (menuItem.isEnabled() == false) return;
final MenuSelectionManager manager = e.getMenuSelectionManager();
- final MenuElement path[] = e.getPath();
+ final MenuElement[] path = e.getPath();
// In Aqua, we always respect the menu's delay, if one is set.
// Doesn't matter how the menu is clicked on or otherwise moused over.
final Point p = e.getPoint();
if (p.x >= 0 && p.x < menuItem.getWidth() && p.y >= 0 && p.y < menuItem.getHeight()) {
final JMenu menu = (JMenu)menuItem;
- final MenuElement selectedPath[] = manager.getSelectedPath();
+ final MenuElement[] selectedPath = manager.getSelectedPath();
if (!(selectedPath.length > 0 && selectedPath[selectedPath.length - 1] == menu.getPopupMenu())) {
if (menu.getDelay() == 0) {
appendPath(path, menu.getPopupMenu());
@@ -124,7 +124,7 @@
}
static void appendPath(final MenuElement[] path, final MenuElement elem) {
- final MenuElement newPath[] = new MenuElement[path.length + 1];
+ final MenuElement[] newPath = new MenuElement[path.length + 1];
System.arraycopy(path, 0, newPath, 0, path.length);
newPath[path.length] = elem;
MenuSelectionManager.defaultManager().setSelectedPath(newPath);
@@ -144,7 +144,7 @@
if (!menu.isEnabled()) return;
final MenuSelectionManager manager = MenuSelectionManager.defaultManager();
- final MenuElement selectedPath[] = manager.getSelectedPath();
+ final MenuElement[] selectedPath = manager.getSelectedPath();
// In Aqua, we always have a menu delay, regardless of where the menu is.
if (!(selectedPath.length > 0 && selectedPath[selectedPath.length - 1] == menu.getPopupMenu())) {
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaSpinnerUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -261,12 +261,14 @@
editor.setInheritsPopupMenu(true);
if (editor.getFont() instanceof UIResource) {
- editor.setFont(new FontUIResource(spinner.getFont()));
+ Font font = spinner.getFont();
+ editor.setFont(font == null ? null : new FontUIResource(font));
}
final JFormattedTextField editorTextField = ((DefaultEditor) editor).getTextField();
if (editorTextField.getFont() instanceof UIResource) {
- editorTextField.setFont(new FontUIResource(spinner.getFont()));
+ Font font = spinner.getFont();
+ editorTextField.setFont(font == null ? null : new FontUIResource(font));
}
final InputMap spinnerInputMap = getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
final InputMap editorInputMap = editorTextField.getInputMap();
@@ -739,7 +741,8 @@
= ((JSpinner.DefaultEditor) editor).getTextField();
if (tf != null) {
if (tf.getFont() instanceof UIResource) {
- tf.setFont(new FontUIResource(spinner.getFont()));
+ Font font = spinner.getFont();
+ tf.setFont(font == null ? null : new FontUIResource(font));
}
}
}
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -113,10 +113,10 @@
// Transient variables (recalculated each time TabbedPane is layed out)
- protected int tabRuns[] = new int[10];
+ protected int[] tabRuns = new int[10];
protected int runCount = 0;
protected int selectedRun = -1;
- protected Rectangle rects[] = new Rectangle[0];
+ protected Rectangle[] rects = new Rectangle[0];
protected int maxTabHeight;
protected int maxTabWidth;
@@ -864,8 +864,8 @@
* subtracting xCropLen[i] from (tab.y + tab.height) and adding yCropLen[i]
* to (tab.x).
*/
- private static int xCropLen[] = { 1, 1, 0, 0, 1, 1, 2, 2 };
- private static int yCropLen[] = { 0, 3, 3, 6, 6, 9, 9, 12 };
+ private static int[] xCropLen = { 1, 1, 0, 0, 1, 1, 2, 2 };
+ private static int[] yCropLen = { 0, 3, 3, 6, 6, 9, 9, 12 };
private static final int CROP_SEGMENT = 12;
private static Polygon createCroppedTabShape(final int tabPlacement, final Rectangle tabRect, final int cropline) {
@@ -895,8 +895,8 @@
rcnt++;
}
final int npts = 2 + (rcnt * 8);
- final int xp[] = new int[npts];
- final int yp[] = new int[npts];
+ final int[] xp = new int[npts];
+ final int[] yp = new int[npts];
int pcnt = 0;
xp[pcnt] = ostart;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -36,7 +36,7 @@
protected final Rectangle rightScrollTabRect = new Rectangle();
protected int numberOfVisibleTabs = 0;
- protected int visibleTabList[] = new int[10];
+ protected int[] visibleTabList = new int[10];
protected int lastLeftmostTab;
protected int lastReturnAt;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaUtils.java Wed Oct 24 13:35:18 2018 +0530
@@ -37,8 +37,6 @@
import javax.swing.border.Border;
import javax.swing.plaf.UIResource;
-import jdk.internal.loader.ClassLoaders;
-
import sun.awt.AppContext;
import sun.lwawt.macosx.CPlatformWindow;
@@ -284,7 +282,6 @@
public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) {
final BufferedImage img = new BufferedImage(width + blur * 2, height + blur * 2, BufferedImage.TYPE_INT_ARGB_PRE);
paintToImage(img, x, y, width, height);
-// debugFrame("border", img);
g.drawImage(img, -blur, -blur, null);
}
@@ -325,7 +322,6 @@
final BufferedImage i = new BufferedImage(templateWidth, templateHeight, BufferedImage.TYPE_INT_ARGB_PRE);
super.paintBorder(null, i.getGraphics(), 0, 0, templateWidth, templateHeight);
-// debugFrame("slices", i);
slices = new SlicedImageControl(i, leftCut, topCut, rightCut, bottomCut, false);
}
@@ -335,29 +331,6 @@
}
}
-// static void debugFrame(String name, Image image) {
-// JFrame f = new JFrame(name);
-// f.setContentPane(new JLabel(new ImageIcon(image)));
-// f.pack();
-// f.setVisible(true);
-// }
-
- // special casing naughty applications, like InstallAnywhere
- // <rdar://problem/4851533> REGR: JButton: Myst IV: the buttons of 1.0.3 updater have redraw issue
- static boolean shouldUseOpaqueButtons() {
- // can we use ClassLoader.getSystemClassLoader here?
- final ClassLoader launcherClassLoader = ClassLoaders.appClassLoader();
- if (classExists(launcherClassLoader, "com.installshield.wizard.platform.macosx.MacOSXUtils")) return true;
- return false;
- }
-
- private static boolean classExists(final ClassLoader classLoader, final String clazzName) {
- try {
- return Class.forName(clazzName, false, classLoader) != null;
- } catch (final Throwable ignored) { }
- return false;
- }
-
private static final RecyclableSingleton<Method> getJComponentGetFlagMethod = new RecyclableSingleton<Method>() {
@Override
protected Method getInstance() {
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -67,7 +67,7 @@
private ScreenMenuPropertyListener fPropertyListener;
// Array of child hashes used to see if we need to recreate the Menu.
- private int childHashArray[];
+ private int[] childHashArray;
ScreenMenu(final JMenu invoker) {
super(invoker.getText());
@@ -85,7 +85,7 @@
* we do not get notified of it, because EDT is busy in our code. We only need to update if the menu contents have changed in some
* way, such as the number of menu items, the text of the menuitems, icon, shortcut etc.
*/
- private static boolean needsUpdate(final Component items[], final int childHashArray[]) {
+ private static boolean needsUpdate(final Component[] items, final int[] childHashArray) {
if (items == null || childHashArray == null) {
return true;
}
--- a/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -28,7 +28,7 @@
public final class CCompositeGlyphMapper extends CompositeGlyphMapper {
private CompositeFont font;
- private CharToGlyphMapper slotMappers[];
+ private CharToGlyphMapper[] slotMappers;
public CCompositeGlyphMapper(CompositeFont compFont) {
super(compFont);
--- a/src/java.desktop/macosx/classes/sun/font/CFont.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/font/CFont.java Wed Oct 24 13:35:18 2018 +0530
@@ -28,7 +28,7 @@
import java.awt.Font;
import java.awt.font.FontRenderContext;
import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;;
+import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
--- a/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -230,7 +230,7 @@
native void doPoly(SurfaceData sData, int[] xpoints, int[] ypoints, int npoints, boolean ispolygon, boolean isfill);
- public void drawPolyline(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+ public void drawPolyline(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
OSXSurfaceData surfaceData = (OSXSurfaceData) sg2d.getSurfaceData();
if ((sg2d.strokeState != SunGraphics2D.STROKE_CUSTOM) && (OSXSurfaceData.IsSimpleColor(sg2d.paint))) {
surfaceData.doPolygon(this, sg2d, xpoints, ypoints, npoints, false, false);
@@ -244,7 +244,7 @@
}
}
- public void drawPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+ public void drawPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
OSXSurfaceData surfaceData = (OSXSurfaceData) sg2d.getSurfaceData();
if ((sg2d.strokeState != SunGraphics2D.STROKE_CUSTOM) && (OSXSurfaceData.IsSimpleColor(sg2d.paint))) {
surfaceData.doPolygon(this, sg2d, xpoints, ypoints, npoints, true, false);
@@ -259,7 +259,7 @@
}
}
- public void fillPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+ public void fillPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
OSXSurfaceData surfaceData = (OSXSurfaceData) sg2d.getSurfaceData();
surfaceData.doPolygon(this, sg2d, xpoints, ypoints, npoints, true, true);
}
--- a/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -84,11 +84,11 @@
draw(sg2d, arc);
}
- public synchronized void drawPolyline(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+ public synchronized void drawPolyline(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
doPolygon(sg2d, xpoints, ypoints, npoints, false, false);
}
- public synchronized void drawPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+ public synchronized void drawPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
doPolygon(sg2d, xpoints, ypoints, npoints, true, false);
}
@@ -120,11 +120,11 @@
fill(sg2d, arc);
}
- public synchronized void fillPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+ public synchronized void fillPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
doPolygon(sg2d, xpoints, ypoints, npoints, true, true);
}
- public synchronized void doPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints, boolean ispolygon, boolean isfill) {
+ public synchronized void doPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints, boolean ispolygon, boolean isfill) {
GeneralPath gp = new GeneralPath(Path2D.WIND_NON_ZERO, npoints);
gp.moveTo(xpoints[0], ypoints[0]);
for (int i = 1; i < npoints; i++) {
@@ -196,7 +196,7 @@
drawGlyphVector(sg2d, sg2d.getFont().createGlyphVector(sg2d.getFontRenderContext(), str), x, y);
}
- public synchronized void drawChars(SunGraphics2D sg2d, char data[], int offset, int length, int x, int y) {
+ public synchronized void drawChars(SunGraphics2D sg2d, char[] data, int offset, int length, int x, int y) {
drawString(sg2d, new String(data, offset, length), x, y);
}
--- a/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -34,7 +34,7 @@
IntBuffer data;
/** All data banks */
- IntBuffer bankdata[];
+ IntBuffer[] bankdata;
/**
* Constructs an integer-based {@code DataBuffer} with a single bank
--- a/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -34,7 +34,7 @@
protected IntBuffer data;
- public static WritableRaster createNIORaster(int w, int h, int bandMasks[], Point location) {
+ public static WritableRaster createNIORaster(int w, int h, int[] bandMasks, Point location) {
if ((w <= 0) || (h <= 0)) {
throw new IllegalArgumentException("Width (" + w + ") and height (" + h +
") cannot be <= 0");
--- a/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -171,7 +171,7 @@
int pixelSize = cm.getPixelSize();
int numOfComponents = cm.getNumColorComponents();
if ((numOfComponents == 3) && (cm instanceof ComponentColorModel) && (sm instanceof PixelInterleavedSampleModel)) {
- int sizes[] = cm.getComponentSize();
+ int[] sizes = cm.getComponentSize();
boolean validsizes = (sizes[0] == 8) && (sizes[1] == 8) && (sizes[2] == 8);
int[] offs = ((ComponentSampleModel) sm).getBandOffsets();
int numBands = raster.getNumBands();
--- a/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -605,14 +605,14 @@
this.fGraphicsStatesInt.put(kColorStateIndex, kColorLinearGradient);
int numColor = color.getColors().length;
- int colorArray[] = new int[numColor];
+ int[] colorArray = new int[numColor];
for (int i = 0; i < numColor; i++) {
colorArray[i] = color.getColors()[i].getRGB();
}
this.fGraphicsStatesObject[kColorArrayIndex] = colorArray;
int numFractions = color.getFractions().length;
- float fractionArray[] = new float[numFractions];
+ float[] fractionArray = new float[numFractions];
for (int i = 0; i < numFractions; i++) {
fractionArray[i] = color.getFractions()[i];
}
@@ -639,14 +639,14 @@
this.fGraphicsStatesInt.put(kColorStateIndex, kColorRadialGradient);
int numColor = color.getColors().length;
- int colorArray[] = new int[numColor];
+ int[] colorArray = new int[numColor];
for (int i = 0; i < numColor; i++) {
colorArray[i] = color.getColors()[i].getRGB();
}
this.fGraphicsStatesObject[kColorArrayIndex] = colorArray;
int numStops = color.getFractions().length;
- float stopsArray[] = new float[numStops];
+ float[] stopsArray = new float[numStops];
for (int i = 0; i < numStops; i++) {
stopsArray[i] = color.getFractions()[i];
}
@@ -1031,7 +1031,7 @@
renderer.doArc(this, x, y, width, height, startAngle, arcAngle, type, isfill);
}
- public void doPolygon(CRenderer renderer, SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints, boolean ispolygon, boolean isfill) {
+ public void doPolygon(CRenderer renderer, SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints, boolean ispolygon, boolean isfill) {
// System.err.println("--- doPolygon");
if ((isfill) && (isCustomPaint(sg2d))) {
@@ -1127,7 +1127,7 @@
renderer.doDrawGlyphs(this, nativeStrikePtr, gv, x, y);
}
- public void drawUnicodes(CTextPipe renderer, SunGraphics2D sg2d, long nativeStrikePtr, char unicodes[], int offset, int length, float x, float y) {
+ public void drawUnicodes(CTextPipe renderer, SunGraphics2D sg2d, long nativeStrikePtr, char[] unicodes, int offset, int length, float x, float y) {
// System.err.println("--- drawUnicodes "+(new String(unicodes, offset, length)));
setupGraphicsState(sg2d, kUnicodes, sg2d.font, 0, 0, fBounds.width, fBounds.height);
if (length == 1) {
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -133,7 +133,7 @@
long cfginfo = 0;
int textureSize = 0;
- final String ids[] = new String[1];
+ final String[] ids = new String[1];
OGLRenderQueue rq = OGLRenderQueue.getInstance();
rq.lock();
try {
--- a/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -23,16 +23,19 @@
* questions.
*/
-
package sun.lwawt;
-import java.awt.*;
+import java.awt.Point;
+import java.awt.Choice;
+
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.peer.ChoicePeer;
import javax.accessibility.Accessible;
-import javax.swing.*;
+import javax.swing.JComboBox;
+import javax.swing.SwingUtilities;
+import javax.swing.JPopupMenu;
/**
* Lightweight implementation of {@link ChoicePeer}. Delegates most of the work
@@ -146,19 +149,6 @@
return LWChoicePeer.this.getLocationOnScreen();
}
- /**
- * We should post ITEM_STATE_CHANGED event when the same element is
- * reselected.
- */
- @Override
- public void setSelectedItem(final Object anObject) {
- final Object oldSelection = selectedItemReminder;
- if (oldSelection != null && oldSelection.equals(anObject)) {
- selectedItemChanged();
- }
- super.setSelectedItem(anObject);
- }
-
@Override
public void firePopupMenuWillBecomeVisible() {
super.firePopupMenuWillBecomeVisible();
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessibility.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -25,17 +25,39 @@
package sun.lwawt.macosx;
-import sun.lwawt.LWWindowPeer;
-
-import java.awt.*;
-import java.beans.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.KeyboardFocusManager;
+import java.awt.Point;
+import java.awt.Window;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
import java.util.concurrent.Callable;
-import javax.accessibility.*;
-import javax.swing.*;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleComponent;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleSelection;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+import javax.accessibility.AccessibleTable;
+import javax.accessibility.AccessibleText;
+import javax.accessibility.AccessibleValue;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JTextArea;
+
import sun.awt.AWTAccessor;
+import sun.lwawt.LWWindowPeer;
class CAccessibility implements PropertyChangeListener {
private static Set<String> ignoredRoles;
@@ -626,7 +648,7 @@
currentAC = currentAccessible.getAccessibleContext();
currentName = currentAC.getAccessibleName();
currentRole = (AccessibleRole)childrenAndRoles.get(i+1);
- if ( currentName.equals(activeDescendantName) &&
+ if (currentName != null && currentName.equals(activeDescendantName) &&
currentRole.equals(activeDescendantRole) ) {
newArray.add(0, currentAccessible);
newArray.add(1, currentRole);
@@ -649,6 +671,26 @@
}, c);
}
+ private static final int JAVA_AX_ROWS = 1;
+ private static final int JAVA_AX_COLS = 2;
+
+ public static int getTableInfo(final Accessible a, final Component c,
+ final int info) {
+ if (a == null) return 0;
+ return invokeAndWait(() -> {
+ AccessibleContext ac = a.getAccessibleContext();
+ AccessibleTable table = ac.getAccessibleTable();
+ if (table != null) {
+ if (info == JAVA_AX_COLS) {
+ return table.getAccessibleColumnCount();
+ } else if (info == JAVA_AX_ROWS) {
+ return table.getAccessibleRowCount();
+ }
+ }
+ return 0;
+ }, c);
+ }
+
private static AccessibleRole getAccessibleRoleForLabel(JLabel l, AccessibleRole fallback) {
String text = l.getText();
if (text != null && text.length() > 0) {
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -33,6 +33,7 @@
import javax.accessibility.AccessibleContext;
import javax.swing.JProgressBar;
import javax.swing.JSlider;
+import javax.swing.JCheckBox;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -110,7 +111,6 @@
}
}
-
private class AXChangeNotifier implements PropertyChangeListener {
@Override
@@ -157,6 +157,11 @@
}
}
}
+
+ // Do send check box state changes to native side
+ if (thisRole == AccessibleRole.CHECK_BOX) {
+ valueChanged(ptr);
+ }
}
}
}
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -41,7 +41,7 @@
public class CImage extends CFRetainedResource {
private static native long nativeCreateNSImageFromArray(int[] buffer, int w, int h);
private static native long nativeCreateNSImageFromBytes(byte[] buffer);
- private static native long nativeCreateNSImageFromArrays(int[][] buffers, int w[], int h[]);
+ private static native long nativeCreateNSImageFromArrays(int[][] buffers, int[] w, int[] h);
private static native long nativeCreateNSImageFromFileContents(String file);
private static native long nativeCreateNSImageOfFileFromLaunchServices(String file);
private static native long nativeCreateNSImageFromImageName(String name);
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -55,7 +55,7 @@
// Intitalize highlight mapping table and its mapper.
static {
@SuppressWarnings({"rawtypes", "unchecked"})
- Map<TextAttribute, Integer> styles[] = new Map[4];
+ Map<TextAttribute, Integer>[] styles = new Map[4];
HashMap<TextAttribute, Integer> map;
// UNSELECTED_RAW_TEXT_HIGHLIGHT
@@ -613,7 +613,7 @@
}
// Get the characters from the iterator
- char selectedText[] = new char[theIterator.getEndIndex() - theIterator.getBeginIndex()];
+ char[] selectedText = new char[theIterator.getEndIndex() - theIterator.getBeginIndex()];
char current = theIterator.first();
int index = 0;
while (current != CharacterIterator.DONE) {
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -106,7 +106,7 @@
}
public String toString() {
- Locale loc[] = getAvailableLocales();
+ Locale[] loc = getAvailableLocales();
String locnames = null;
for (int i = 0; i < loc.length; i++) {
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java Wed Oct 24 13:35:18 2018 +0530
@@ -246,18 +246,22 @@
}
}
+ boolean isPrintToFile = false;
+ private void setPrintToFile(boolean printToFile) {
+ isPrintToFile = printToFile;
+ }
+
@Override
public void print(PrintRequestAttributeSet attributes) throws PrinterException {
// NOTE: Some of this code is copied from RasterPrinterJob.
-
// this code uses javax.print APIs
// this will make it print directly to the printer
// this will not work if the user clicks on the "Preview" button
// However if the printer is a StreamPrintService, its the right path.
PrintService psvc = getPrintService();
- if (psvc == null) {
+ if (psvc == null && !isPrintToFile) {
throw new PrinterException("No print service found.");
}
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -173,7 +173,7 @@
*/
@Override
public int getRGBPixel(int x, int y) {
- int c[] = new int[1];
+ int[] c = new int[1];
double scale = fDevice.getScaleFactor();
getScreenPixels(new Rectangle(x, y, (int) scale, (int) scale), c);
return c[0];
@@ -186,7 +186,7 @@
*/
@Override
public int [] getRGBPixels(final Rectangle bounds) {
- int c[] = new int[bounds.width * bounds.height];
+ int[] c = new int[bounds.width * bounds.height];
getScreenPixels(bounds, c);
return c;
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -38,7 +38,7 @@
public class CTextPipe implements TextPipe {
public native void doDrawString(SurfaceData sData, long nativeStrikePtr, String s, double x, double y);
public native void doDrawGlyphs(SurfaceData sData, long nativeStrikePtr, GlyphVector gV, float x, float y);
- public native void doUnicodes(SurfaceData sData, long nativeStrikePtr, char unicodes[], int offset, int length, float x, float y);
+ public native void doUnicodes(SurfaceData sData, long nativeStrikePtr, char[] unicodes, int offset, int length, float x, float y);
public native void doOneUnicode(SurfaceData sData, long nativeStrikePtr, char aUnicode, float x, float y);
long getNativeStrikePtr(final SunGraphics2D sg2d) {
@@ -95,7 +95,7 @@
sg2d.setFont(prevFont);
}
- public void drawChars(final SunGraphics2D sg2d, final char data[], final int offset, final int length, final int x, final int y) {
+ public void drawChars(final SunGraphics2D sg2d, final char[] data, final int offset, final int length, final int x, final int y) {
final long nativeStrikePtr = getNativeStrikePtr(sg2d);
if (OSXSurfaceData.IsSimpleColor(sg2d.paint) && nativeStrikePtr != 0) {
final OSXSurfaceData surfaceData = (OSXSurfaceData)sg2d.getSurfaceData();
@@ -120,7 +120,7 @@
super.doDrawGlyphs(sData, nativeStrikePtr, gV, x, y);
}
- public void doUnicodes(final SurfaceData sData, final long nativeStrikePtr, final char unicodes[], final int offset, final int length, final float x, final float y) {
+ public void doUnicodes(final SurfaceData sData, final long nativeStrikePtr, final char[] unicodes, final int offset, final int length, final float x, final float y) {
GraphicsPrimitive.tracePrimitive("QuartzDrawUnicodes");
super.doUnicodes(sData, nativeStrikePtr, unicodes, offset, length, x, y);
}
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m Wed Oct 24 13:35:18 2018 +0530
@@ -315,6 +315,13 @@
static JNF_MEMBER_CACHE(jm_setCopiesAttribute, sjc_CPrinterJob, "setCopiesAttribute", "(I)V");
static JNF_MEMBER_CACHE(jm_setCollated, sjc_CPrinterJob, "setCollated", "(Z)V");
static JNF_MEMBER_CACHE(jm_setPageRangeAttribute, sjc_CPrinterJob, "setPageRangeAttribute", "(IIZ)V");
+ static JNF_MEMBER_CACHE(jm_setPrintToFile, sjc_CPrinterJob, "setPrintToFile", "(Z)V");
+
+ if (src.jobDisposition == NSPrintSaveJob) {
+ JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, true);
+ } else {
+ JNFCallVoidMethod(env, dstPrinterJob, jm_setPrintToFile, false);
+ }
// get the selected printer's name, and set the appropriate PrintService on the Java side
NSString *name = [[src printer] name];
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, 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
@@ -368,7 +368,7 @@
[sRoles setObject:NSAccessibilitySplitGroupRole forKey:@"splitpane"];
[sRoles setObject:NSAccessibilityValueIndicatorRole forKey:@"statusbar"];
[sRoles setObject:NSAccessibilityGroupRole forKey:@"swingcomponent"];
- [sRoles setObject:NSAccessibilityTableRole forKey:@"table"];
+ [sRoles setObject:NSAccessibilityGridRole forKey:@"table"];
[sRoles setObject:NSAccessibilityTextFieldRole forKey:@"text"];
[sRoles setObject:NSAccessibilityTextAreaRole forKey:@"textarea"]; // supports top/bottom of document notifications: CAccessability.getAccessibleRole()
[sRoles setObject:NSAccessibilityCheckBoxRole forKey:@"togglebutton"];
--- a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m Wed Oct 24 13:35:18 2018 +0530
@@ -54,6 +54,7 @@
// If the value is >=0, it's an index
static JNF_STATIC_MEMBER_CACHE(jm_getChildrenAndRoles, sjc_CAccessibility, "getChildrenAndRoles", "(Ljavax/accessibility/Accessible;Ljava/awt/Component;IZ)[Ljava/lang/Object;");
+static JNF_STATIC_MEMBER_CACHE(jm_getTableInfo, sjc_CAccessibility, "getTableInfo", "(Ljavax/accessibility/Accessible;Ljava/awt/Component;I)I");
static JNF_STATIC_MEMBER_CACHE(sjm_getAccessibleComponent, sjc_CAccessibility, "getAccessibleComponent", "(Ljavax/accessibility/Accessible;Ljava/awt/Component;)Ljavax/accessibility/AccessibleComponent;");
static JNF_STATIC_MEMBER_CACHE(sjm_getAccessibleValue, sjc_CAccessibility, "getAccessibleValue", "(Ljavax/accessibility/Accessible;Ljava/awt/Component;)Ljavax/accessibility/AccessibleValue;");
static JNF_STATIC_MEMBER_CACHE(sjm_getAccessibleName, sjc_CAccessibility, "getAccessibleName", "(Ljavax/accessibility/Accessible;Ljava/awt/Component;)Ljava/lang/String;");
@@ -117,6 +118,14 @@
- (BOOL)accessibilityIsHorizontalScrollBarAttributeSettable;
@end
+@interface TableAccessibility : JavaComponentAccessibility {
+
+}
+- (NSArray *)initializeAttributeNamesWithEnv:(JNIEnv *)env;
+- (NSArray *)accessibilityRowsAttribute;
+- (NSArray *)accessibilityColumnsAttribute;
+@end
+
@implementation JavaComponentAccessibility
@@ -370,6 +379,8 @@
JavaComponentAccessibility *newChild = nil;
if ([javaRole isEqualToString:@"pagetablist"]) {
newChild = [TabGroupAccessibility alloc];
+ } else if ([javaRole isEqualToString:@"table"]) {
+ newChild = [TableAccessibility alloc];
} else if ([javaRole isEqualToString:@"scrollpane"]) {
newChild = [ScrollAreaAccessibility alloc];
} else {
@@ -484,7 +495,8 @@
// children
if (attributeStatesArray[6]) {
[attributeNames addObject:NSAccessibilityChildrenAttribute];
- if ([javaRole isEqualToString:@"list"]) {
+ if ([javaRole isEqualToString:@"list"]
+ || [javaRole isEqualToString:@"table"]) {
[attributeNames addObject:NSAccessibilitySelectedChildrenAttribute];
[attributeNames addObject:NSAccessibilityVisibleChildrenAttribute];
}
@@ -652,7 +664,9 @@
id myParent = [self accessibilityParentAttribute];
if ([myParent isKindOfClass:[JavaComponentAccessibility class]]) {
NSString *parentRole = [(JavaComponentAccessibility *)myParent javaRole];
- if ([parentRole isEqualToString:@"list"]) {
+
+ if ([parentRole isEqualToString:@"list"]
+ || [parentRole isEqualToString:@"table"]) {
NSMutableArray *moreNames =
[[NSMutableArray alloc] initWithCapacity: [names count] + 2];
[moreNames addObjectsFromArray: names];
@@ -1847,6 +1861,41 @@
@end
+// these constants are duplicated in CAccessibility.java
+#define JAVA_AX_ROWS (1)
+#define JAVA_AX_COLS (2)
+
+@implementation TableAccessibility
+
+- (NSArray *)initializeAttributeNamesWithEnv:(JNIEnv *)env
+{
+ NSMutableArray *names = (NSMutableArray *)[super initializeAttributeNamesWithEnv:env];
+
+ [names addObject:NSAccessibilityRowCountAttribute];
+ [names addObject:NSAccessibilityColumnCountAttribute];
+ return names;
+}
+
+- (id)getTableInfo:(jint)info {
+ if (fAccessible == NULL) return 0;
+
+ JNIEnv* env = [ThreadUtilities getJNIEnv];
+ jint count = JNFCallStaticIntMethod(env, jm_getTableInfo, fAccessible,
+ fComponent, info);
+ NSNumber *index = [NSNumber numberWithInt:count];
+ return index;
+}
+
+
+- (id)accessibilityRowCountAttribute {
+ return [self getTableInfo:JAVA_AX_ROWS];
+}
+
+- (id)accessibilityColumnCountAttribute {
+ return [self getTableInfo:JAVA_AX_COLS];
+}
+@end
+
/*
* Returns Object.equals for the two items
* This may use LWCToolkit.invokeAndWait(); don't call while holding fLock
--- a/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -195,11 +195,11 @@
}
- private String colorNames[] = { " ", "white", "lightGray", "gray", "darkGray",
+ private String[] colorNames = { " ", "white", "lightGray", "gray", "darkGray",
"black", "red", "pink", "orange",
"yellow", "green", "magenta", "cyan",
"blue"};
- private Color colors[] = { null, Color.white, Color.lightGray, Color.gray, Color.darkGray,
+ private Color[] colors = { null, Color.white, Color.lightGray, Color.gray, Color.darkGray,
Color.black, Color.red, Color.pink, Color.orange,
Color.yellow, Color.green, Color.magenta, Color.cyan,
Color.blue};
--- a/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -213,7 +213,7 @@
private Choice styleChoser;
private Choice sizeChoser;
- private String fonts[];
+ private String[] fonts;
private String[] styleNames = { "plain", "bold", "italic" };
private int[] styles = { Font.PLAIN, Font.BOLD, Font.ITALIC };
private int[] pointSizes = { 3, 5, 8, 10, 12, 14, 18, 24, 36, 48 };
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java Wed Oct 24 13:35:18 2018 +0530
@@ -122,7 +122,7 @@
private long bitmapStart;
private long compression;
private long imageSize;
- private byte palette[];
+ private byte[] palette;
private int imageType;
private int numBands;
private boolean isBottomUp;
@@ -655,7 +655,7 @@
}
// Create IndexColorModel from the palette.
- byte r[], g[], b[];
+ byte[] r, g, b;
if (imageType == VERSION_2_1_BIT ||
imageType == VERSION_2_4_BIT ||
imageType == VERSION_2_8_BIT) {
@@ -885,9 +885,9 @@
noTransform &= destinationRegion.equals(raster.getBounds());
}
- byte bdata[] = null; // buffer for byte data
- short sdata[] = null; // buffer for short data
- int idata[] = null; // buffer for int data
+ byte[] bdata = null; // buffer for byte data
+ short[] sdata = null; // buffer for short data
+ int[] idata = null; // buffer for int data
// the sampleModel can be null in case of embedded image
if (sampleModel != null) {
@@ -1368,7 +1368,7 @@
}
}
- private void read16Bit(short sdata[]) throws IOException {
+ private void read16Bit(short[] sdata) throws IOException {
// Padding bytes at the end of each scanline
// width * bitsPerPixel should be divisible by 32
int padding = width * 2 % 4;
@@ -1434,7 +1434,7 @@
}
}
- private void read32Bit(int idata[]) throws IOException {
+ private void read32Bit(int[] idata) throws IOException {
if (noTransform) {
int j = isBottomUp ? (height -1) * width : 0;
@@ -1490,7 +1490,7 @@
}
}
- private void readRLE8(byte bdata[]) throws IOException {
+ private void readRLE8(byte[] bdata) throws IOException {
// If imageSize field is not provided, calculate it.
int imSize = (int)imageSize;
if (imSize == 0) {
@@ -1506,7 +1506,7 @@
}
// Read till we have the whole image
- byte values[] = new byte[imSize];
+ byte[] values = new byte[imSize];
int bytesRead = 0;
iis.readFully(values, 0, imSize);
@@ -1562,7 +1562,7 @@
byte[] values,
byte[] bdata) throws IOException {
- byte val[] = new byte[width];
+ byte[] val = new byte[width];
int count = 0, l = 0;
int value;
boolean flag = false;
@@ -1864,7 +1864,7 @@
// Ensure to check if the source index-count, does not
// exceed the source image size
if (count < imSize) {
- int alternate[] = { (values[count] & 0xf0) >> 4,
+ int[] alternate = { (values[count] & 0xf0) >> 4,
values[count] & 0x0f };
for (int i=0; (i < value) && (l < width); i++) {
val[l++] = (byte)alternate[i & 1];
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -295,7 +295,7 @@
noTransform &= bgrOrder;
- int sampleSize[] = sampleModel.getSampleSize();
+ int[] sampleSize = sampleModel.getSampleSize();
//XXX: check more
@@ -322,7 +322,7 @@
+ BMPCompressionTypes.getName(compressionType));
}
- byte r[] = null, g[] = null, b[] = null, a[] = null;
+ byte[] r = null, g = null, b = null, a = null;
if (compressionType == BI_BITFIELDS) {
bitsPerPixel =
@@ -752,7 +752,7 @@
}
private void writePixels(int l, int scanlineBytes, int bitsPerPixel,
- int pixels[],
+ int[] pixels,
int padding, int numBands,
IndexColorModel icm) throws IOException {
int pixel = 0;
@@ -867,9 +867,9 @@
// Case where IndexColorModel had > 256 colors.
int entries = icm.getMapSize();
- byte r[] = new byte[entries];
- byte g[] = new byte[entries];
- byte b[] = new byte[entries];
+ byte[] r = new byte[entries];
+ byte[] g = new byte[entries];
+ byte[] b = new byte[entries];
icm.getReds(r);
icm.getGreens(g);
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -35,7 +35,7 @@
*/
public class BitFile {
ImageOutputStream output;
- byte buffer[];
+ byte[] buffer;
int index;
int bitsLeft; // bits left at current index that are avail.
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -43,7 +43,7 @@
return stream.read();
}
- public int read(byte b[], int off, int len) throws IOException {
+ public int read(byte[] b, int off, int len) throws IOException {
return stream.read(b, off, len);
}
}
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -263,7 +263,7 @@
* property names.
*/
public String[] getPropertyNames(String prefix) {
- String propertyNames[] = getPropertyNames();
+ String[] propertyNames = getPropertyNames();
if (propertyNames == null) {
return null;
}
@@ -282,7 +282,7 @@
}
// Copy the strings from the Vector over to a String array.
- String prefixNames[] = new String[names.size()];
+ String[] prefixNames = new String[names.size()];
int count = 0;
for (Iterator<String> it = names.iterator(); it.hasNext(); ) {
prefixNames[count++] = it.next();
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -71,13 +71,13 @@
// Data structures needed to store changing elements for the previous
// and the current scanline
private int changingElemSize = 0;
- private int prevChangingElems[];
- private int currChangingElems[];
+ private int[] prevChangingElems;
+ private int[] currChangingElems;
// Element at which to start search in getNextChangingElement
private int lastChangingElement = 0;
- private static int table1[] = {
+ private static int[] table1 = {
0x00, // 0 bits are left in first byte - SHOULD NOT HAPPEN
0x01, // 1 bits are left in first byte
0x03, // 2 bits are left in first byte
@@ -89,7 +89,7 @@
0xff // 8 bits are left in first byte
};
- private static int table2[] = {
+ private static int[] table2 = {
0x00, // 0
0x80, // 1
0xc0, // 2
@@ -103,7 +103,7 @@
// Table to be used for flipping bytes when fillOrder is
// BaselineTIFFTagSet.FILL_ORDER_RIGHT_TO_LEFT (2).
- static byte flipTable[] = {
+ static byte[] flipTable = {
0, -128, 64, -64, 32, -96, 96, -32,
16, -112, 80, -48, 48, -80, 112, -16,
8, -120, 72, -56, 40, -88, 104, -24,
@@ -139,7 +139,7 @@
};
// The main 10 bit white runs lookup table
- private static short white[] = {
+ private static short[] white = {
// 0 - 7
6430, 6400, 6400, 6400, 3225, 3225, 3225, 3225,
// 8 - 15
@@ -399,7 +399,7 @@
};
// Additional make up codes for both White and Black runs
- private static short additionalMakeup[] = {
+ private static short[] additionalMakeup = {
28679, 28679, 31752, (short)32777,
(short)33801, (short)34825, (short)35849, (short)36873,
(short)29703, (short)29703, (short)30727, (short)30727,
@@ -407,7 +407,7 @@
};
// Initial black run look up table, uses the first 4 bits of a code
- private static short initBlack[] = {
+ private static short[] initBlack = {
// 0 - 7
3226, 6412, 200, 168, 38, 38, 134, 134,
// 8 - 15
@@ -415,10 +415,10 @@
};
//
- private static short twoBitBlack[] = {292, 260, 226, 226}; // 0 - 3
+ private static short[] twoBitBlack = {292, 260, 226, 226}; // 0 - 3
// Main black run table, using the last 9 bits of possible 13 bit code
- private static short black[] = {
+ private static short[] black = {
// 0 - 7
62, 62, 30, 30, 0, 0, 0, 0,
// 8 - 15
@@ -549,7 +549,7 @@
390, 390, 390, 390, 390, 390, 390, 390,
};
- private static byte twoDCodes[] = {
+ private static byte[] twoDCodes = {
// 0 - 7
80, 88, 23, 71, 30, 30, 62, 62,
// 8 - 15
@@ -853,7 +853,7 @@
int entry, code, bits, color;
boolean isWhite;
int currIndex = 0;
- int temp[];
+ int[] temp;
if(data.length < 2) {
throw new IIOException("Insufficient data to read initial EOL.");
@@ -1029,7 +1029,7 @@
byte color;
boolean isWhite;
int currIndex;
- int temp[];
+ int[] temp;
// Return values from getNextChangingElement
int[] b = new int[2];
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -34,7 +34,7 @@
private static final int EOI_CODE = 257;
private static final int FIRST_CODE = 258;
- private static final int andTable[] = {
+ private static final int[] andTable = {
511,
1023,
2047,
@@ -53,7 +53,7 @@
private int srcIndex;
private int dstIndex;
- private byte stringTable[][];
+ private byte[][] stringTable;
private int tableIndex, bitsToGet = 9;
private int nextData = 0;
@@ -215,7 +215,7 @@
/**
* Write out the string just uncompressed.
*/
- public void writeString(byte string[]) {
+ public void writeString(byte[] string) {
if(dstIndex < dstData.length) {
int maxIndex = Math.min(string.length,
dstData.length - dstIndex);
@@ -229,9 +229,9 @@
/**
* Add a new string to the string table.
*/
- public void addStringToTable(byte oldString[], byte newString) {
+ public void addStringToTable(byte[] oldString, byte newString) {
int length = oldString.length;
- byte string[] = new byte[length + 1];
+ byte[] string = new byte[length + 1];
System.arraycopy(oldString, 0, string, 0, length);
string[length] = newString;
@@ -250,7 +250,7 @@
/**
* Add a new string to the string table.
*/
- public void addStringToTable(byte string[]) {
+ public void addStringToTable(byte[] string) {
// Add this new String to the table
stringTable[tableIndex++] = string;
@@ -266,9 +266,9 @@
/**
* Append {@code newString} to the end of {@code oldString}.
*/
- public byte[] composeString(byte oldString[], byte newString) {
+ public byte[] composeString(byte[] oldString, byte newString) {
int length = oldString.length;
- byte string[] = new byte[length + 1];
+ byte[] string = new byte[length + 1];
System.arraycopy(oldString, 0, string, 0, length);
string[length] = newString;
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -37,13 +37,13 @@
byte[] dstData;
int dstIndex = 0;
- byte stringTable[][];
+ byte[][] stringTable;
int tableIndex, bitsToGet = 9;
int nextData = 0;
int nextBits = 0;
- private static final int andTable[] = {
+ private static final int[] andTable = {
511,
1023,
2047,
@@ -143,7 +143,7 @@
/**
* Write out the string just uncompressed.
*/
- public void writeString(byte string[]) {
+ public void writeString(byte[] string) {
ensureCapacity(string.length);
for (int i = 0; i < string.length; i++) {
dstData[dstIndex++] = string[i];
@@ -153,9 +153,9 @@
/**
* Add a new string to the string table.
*/
- public void addStringToTable(byte oldString[], byte newString) {
+ public void addStringToTable(byte[] oldString, byte newString) {
int length = oldString.length;
- byte string[] = new byte[length + 1];
+ byte[] string = new byte[length + 1];
System.arraycopy(oldString, 0, string, 0, length);
string[length] = newString;
@@ -174,7 +174,7 @@
/**
* Add a new string to the string table.
*/
- public void addStringToTable(byte string[]) {
+ public void addStringToTable(byte[] string) {
// Add this new String to the table
stringTable[tableIndex++] = string;
@@ -190,9 +190,9 @@
/**
* Append {@code newString} to the end of {@code oldString}.
*/
- public byte[] composeString(byte oldString[], byte newString) {
+ public byte[] composeString(byte[] oldString, byte newString) {
int length = oldString.length;
- byte string[] = new byte[length + 1];
+ byte[] string = new byte[length + 1];
System.arraycopy(oldString, 0, string, 0, length);
string[length] = newString;
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -1497,7 +1497,7 @@
GTKIconFactory.resetIcons();
}
lnf.loadStyles();
- Window appWindows[] = Window.getWindows();
+ Window[] appWindows = Window.getWindows();
for (int i = 0; i < appWindows.length; i++) {
SynthLookAndFeel.updateStyles(appWindows[i]);
}
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -61,7 +61,7 @@
PositionType.TOP, PositionType.LEFT
};
- private static final ShadowType SHADOWS[] = {
+ private static final ShadowType[] SHADOWS = {
ShadowType.NONE, ShadowType.IN, ShadowType.OUT,
ShadowType.ETCHED_IN, ShadowType.OUT
};
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -2028,8 +2028,8 @@
AffineTransform affine;
int index;
- double ctrlpts[][];
- int types[];
+ double[][] ctrlpts;
+ int[] types;
private static final double angle = Math.PI / 4.0;
private static final double a = 1.0 - Math.cos(angle);
@@ -2042,7 +2042,7 @@
// 4 values for each point {v0, v1, v2, v3}:
// point = (x + v0 * w + v1 * arcWidth,
// y + v2 * h + v3 * arcHeight);
- private static final double CtrlPtTemplate[][] = {
+ private static final double[][] CtrlPtTemplate = {
{ 0.0, 0.0, 1.0, 0.0 }, /* BOTTOM LEFT corner */
{ 0.0, 0.0, 1.0, -0.5 }, /* BOTTOM LEFT arc start */
{ 0.0, 0.0, 1.0, -acv, /* BOTTOM LEFT arc curve */
@@ -2065,7 +2065,7 @@
0.0, 0.0, 0.0, 0.5 },
{}, /* Closing path element */
};
- private static final int CornerFlags[] = {
+ private static final int[] CornerFlags = {
RoundRectClipShape.BOTTOM_LEFT,
RoundRectClipShape.BOTTOM_RIGHT,
RoundRectClipShape.TOP_RIGHT,
@@ -2126,7 +2126,7 @@
if (isDone()) {
throw new NoSuchElementException("roundrect iterator out of bounds");
}
- double ctrls[] = ctrlpts[index];
+ double[] ctrls = ctrlpts[index];
int nc = 0;
for (int i = 0; i < ctrls.length; i += 4) {
coords[nc++] = (float) (x + ctrls[i + 0] * w + ctrls[i + 1] * aw);
@@ -2142,7 +2142,7 @@
if (isDone()) {
throw new NoSuchElementException("roundrect iterator out of bounds");
}
- double ctrls[] = ctrlpts[index];
+ double[] ctrls = ctrlpts[index];
int nc = 0;
for (int i = 0; i < ctrls.length; i += 4) {
coords[nc++] = x + ctrls[i + 0] * w + ctrls[i + 1] * aw;
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -65,7 +65,7 @@
return new MotifChangeHandler((JMenu)c, this);
}
- private boolean popupIsOpen(JMenu m,MenuElement me[]) {
+ private boolean popupIsOpen(JMenu m,MenuElement[] me) {
int i;
JPopupMenu pm = m.getPopupMenu();
@@ -111,7 +111,7 @@
} else {
Container cnt = menu.getParent();
if(cnt != null && cnt instanceof JMenuBar) {
- MenuElement me[] = new MenuElement[2];
+ MenuElement[] me = new MenuElement[2];
me[0]=(MenuElement)cnt;
me[1]=menu;
manager.setSelectedPath(me);
@@ -119,9 +119,9 @@
}
}
- MenuElement path[] = getPath();
+ MenuElement[] path = getPath();
if (path.length > 0) {
- MenuElement newPath[] = new MenuElement[path.length+1];
+ MenuElement[] newPath = new MenuElement[path.length+1];
System.arraycopy(path,0,newPath,0,path.length);
newPath[path.length] = menu.getPopupMenu();
manager.setSelectedPath(newPath);
--- a/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -234,7 +234,7 @@
int bytesRead = 0;
int bytesWritten = 0;
InputStream fileStream = getFileStream(aiffFileFormat, in);
- byte buffer[] = new byte[bisBufferSize];
+ byte[] buffer = new byte[bisBufferSize];
int maxLength = aiffFileFormat.getByteLength();
while( (bytesRead = fileStream.read( buffer )) >= 0 ) {
@@ -288,7 +288,7 @@
float sampleFramesPerSecond = format.getSampleRate();
int compCode = AiffFileFormat.AIFC_PCM;
- byte header[] = null;
+ byte[] header = null;
InputStream codedAudioStream = audioStream;
// if we need to do any format conversion, do it here....
--- a/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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,7 +47,7 @@
private static final byte[] ALAW_TABH = new byte[256];
private static final byte[] ALAW_TABL = new byte[256];
- private static final short seg_end[] = {
+ private static final short[] seg_end = {
0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF
};
@@ -91,7 +91,7 @@
if( sourceFormat.getSampleSizeInBits() == 16 ) {
- AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+ AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
enc[0] = AudioFormat.Encoding.ALAW;
return enc;
@@ -102,7 +102,7 @@
if( sourceFormat.getSampleSizeInBits() == 8 ) {
- AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+ AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
enc[0] = AudioFormat.Encoding.PCM_SIGNED;
return enc;
@@ -246,7 +246,7 @@
// tempBuffer required only for encoding (when encode is true)
private static final int tempBufferSize = 64;
- private byte tempBuffer [] = null;
+ private byte[] tempBuffer = null;
/**
* True to encode to a-law, false to decode to linear
@@ -256,8 +256,8 @@
AudioFormat encodeFormat;
AudioFormat decodeFormat;
- byte tabByte1[] = null;
- byte tabByte2[] = null;
+ byte[] tabByte1 = null;
+ byte[] tabByte2 = null;
int highByte = 0;
int lowByte = 1;
@@ -320,7 +320,7 @@
* $$jb 2/23/99
* Used to determine segment number in aLaw encoding
*/
- private short search(short val, short table[], short size) {
+ private short search(short val, short[] table, short size) {
for(short i = 0; i < size; i++) {
if (val <= table[i]) { return i; }
}
--- a/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -219,7 +219,7 @@
int bytesRead = 0;
int bytesWritten = 0;
InputStream fileStream = getFileStream(auFileFormat, in);
- byte buffer[] = new byte[bisBufferSize];
+ byte[] buffer = new byte[bisBufferSize];
int maxLength = auFileFormat.getByteLength();
while( (bytesRead = fileStream.read( buffer )) >= 0 ) {
--- a/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java Wed Oct 24 13:35:18 2018 +0530
@@ -1148,7 +1148,7 @@
// to be allocated)
int MAX_READ_LIMIT = 16384;
DirectBAOS dbaos = new DirectBAOS();
- byte tmp[] = new byte[MAX_READ_LIMIT];
+ byte[] tmp = new byte[MAX_READ_LIMIT];
int thisRead = 0;
while (thisRead >= 0) {
thisRead = stream.read(tmp, 0, tmp.length);
--- a/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -635,7 +635,7 @@
public static SF2Layer new_guitar_pick(SF2Soundbank sf2) {
- double datab[];
+ double[] datab;
// Make treble part
{
@@ -814,7 +814,7 @@
public static SF2Layer new_piano_hammer(SF2Soundbank sf2) {
- double datab[];
+ double[] datab;
// Make treble part
{
@@ -1803,8 +1803,8 @@
public static SF2Layer new_timpani(SF2Soundbank sf2) {
- double datab[];
- double datah[];
+ double[] datab;
+ double[] datah;
// Make Bass Part
{
@@ -1891,8 +1891,8 @@
public static SF2Layer new_melodic_toms(SF2Soundbank sf2) {
- double datab[];
- double datah[];
+ double[] datab;
+ double[] datah;
// Make Bass Part
{
@@ -1969,7 +1969,7 @@
}
public static SF2Layer new_reverse_cymbal(SF2Soundbank sf2) {
- double datah[];
+ double[] datah;
{
int fftlen = 4096 * 4;
double[] data = new double[2 * fftlen];
@@ -2012,8 +2012,8 @@
public static SF2Layer new_snare_drum(SF2Soundbank sf2) {
- double datab[];
- double datah[];
+ double[] datab;
+ double[] datah;
// Make Bass Part
{
@@ -2088,8 +2088,8 @@
public static SF2Layer new_bass_drum(SF2Soundbank sf2) {
- double datab[];
- double datah[];
+ double[] datab;
+ double[] datah;
// Make Bass Part
{
@@ -2162,8 +2162,8 @@
public static SF2Layer new_tom(SF2Soundbank sf2) {
- double datab[];
- double datah[];
+ double[] datab;
+ double[] datah;
// Make Bass Part
{
@@ -2240,7 +2240,7 @@
}
public static SF2Layer new_closed_hihat(SF2Soundbank sf2) {
- double datah[];
+ double[] datah;
// Make treble part
{
@@ -2291,7 +2291,7 @@
}
public static SF2Layer new_open_hihat(SF2Soundbank sf2) {
- double datah[];
+ double[] datah;
{
int fftlen = 4096 * 4;
double[] data = new double[2 * fftlen];
@@ -2332,7 +2332,7 @@
}
public static SF2Layer new_crash_cymbal(SF2Soundbank sf2) {
- double datah[];
+ double[] datah;
{
int fftlen = 4096 * 4;
double[] data = new double[2 * fftlen];
@@ -2372,7 +2372,7 @@
}
public static SF2Layer new_side_stick(SF2Soundbank sf2) {
- double datab[];
+ double[] datab;
// Make treble part
{
--- a/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java Wed Oct 24 13:35:18 2018 +0530
@@ -66,7 +66,7 @@
private long lastPlayCall = 0;
private static final int MINIMUM_PLAY_DELAY = 30;
- private byte loadedAudio[] = null;
+ private byte[] loadedAudio = null;
private int loadedAudioByteLength = 0;
private AudioFormat loadedAudioFormat = null;
@@ -383,7 +383,7 @@
private void readStream(AudioInputStream as) throws IOException {
DirectBAOS baos = new DirectBAOS();
- byte buffer[] = new byte[16384];
+ byte[] buffer = new byte[16384];
int bytesRead = 0;
int totalBytesRead = 0;
--- a/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -102,7 +102,7 @@
}
@Override
- public int read(byte b[], int off, int len) throws IOException {
+ public int read(byte[] b, int off, int len) throws IOException {
if (len > left)
len = (int)left;
if (left == 0)
--- a/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -156,11 +156,11 @@
}
}
- public void readFully(byte b[]) throws IOException {
+ public void readFully(byte[] b) throws IOException {
readFully(b, 0, b.length);
}
- public void readFully(byte b[], int off, int len) throws IOException {
+ public void readFully(byte[] b, int off, int len) throws IOException {
if (len < 0)
throw new IndexOutOfBoundsException();
while (len > 0) {
--- a/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -279,7 +279,7 @@
}
@Override
- public void write(byte b[], int off, int len) throws IOException {
+ public void write(byte[] b, int off, int len) throws IOException {
if (!writeoverride) {
if (chunktype != 2) {
throw new IllegalArgumentException(
--- a/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -1126,7 +1126,7 @@
}
return;
}
- int temp[] = new int[ controllers.length + c.length ];
+ int[] temp = new int[ controllers.length + c.length ];
int elements;
// first add what we have
@@ -1149,7 +1149,7 @@
}
}
// now keep only the elements we need
- int newc[] = new int[ elements ];
+ int[] newc = new int[ elements ];
for(int i=0; i<elements; i++){
newc[i] = temp[i];
}
@@ -1161,7 +1161,7 @@
if (c==null) {
controllers = new int[0];
} else {
- int temp[] = new int[ controllers.length ];
+ int[] temp = new int[ controllers.length ];
int elements = 0;
@@ -1178,7 +1178,7 @@
}
}
// now keep only the elements remaining
- int newc[] = new int[ elements ];
+ int[] newc = new int[ elements ];
for(int i=0; i<elements; i++) {
newc[i] = temp[i];
}
@@ -1195,7 +1195,7 @@
return null;
}
- int c[] = new int[controllers.length];
+ int[] c = new int[controllers.length];
for(int i=0; i<controllers.length; i++){
c[i] = controllers[i];
--- a/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -87,7 +87,7 @@
this.feedback = feedback;
}
- public void processReplace(float inout[]) {
+ public void processReplace(float[] inout) {
int len = inout.length;
int delaybuffersize = this.delaybuffersize;
int rovepos = this.rovepos;
@@ -102,7 +102,7 @@
this.rovepos = rovepos;
}
- public void processReplace(float in[], float out[]) {
+ public void processReplace(float[] in, float[] out) {
int len = in.length;
int delaybuffersize = this.delaybuffersize;
int rovepos = this.rovepos;
@@ -138,7 +138,7 @@
filtercoeff2 = (1 - filtercoeff1)* feedback;
}
- public void processMix(float in[], float out[]) {
+ public void processMix(float[] in, float[] out) {
int len = in.length;
int delaybuffersize = this.delaybuffersize;
int rovepos = this.rovepos;
@@ -159,7 +159,7 @@
this.rovepos = rovepos;
}
- public void processReplace(float in[], float out[]) {
+ public void processReplace(float[] in, float[] out) {
int len = in.length;
int delaybuffersize = this.delaybuffersize;
int rovepos = this.rovepos;
--- a/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -74,7 +74,7 @@
/**
* MIDI parser types.
*/
- private static final int types[] = {
+ private static final int[] types = {
MIDI_TYPE_0,
MIDI_TYPE_1
};
@@ -96,8 +96,8 @@
*/
@Override
public int[] getMidiFileTypes(Sequence sequence){
- int typesArray[];
- Track tracks[] = sequence.getTracks();
+ int[] typesArray;
+ Track[] tracks = sequence.getTracks();
if( tracks.length==1 ) {
typesArray = new int[2];
@@ -149,7 +149,7 @@
//=================================================================================
private InputStream getFileStream(int type, Sequence sequence) throws IOException {
- Track tracks[] = sequence.getTracks();
+ Track[] tracks = sequence.getTracks();
int bytesBuilt = 0;
int headerLength = 14;
int length = 0;
@@ -160,7 +160,7 @@
DataOutputStream hdos = null;
PipedInputStream headerStream = null;
- InputStream trackStreams [] = null;
+ InputStream[] trackStreams = null;
InputStream trackStream = null;
InputStream fStream = null;
@@ -344,7 +344,7 @@
int metatype;
int data1, data2;
int length;
- byte data[] = null;
+ byte[] data = null;
ShortMessage shortMessage = null;
MetaMessage metaMessage = null;
SysexMessage sysexMessage = null;
--- a/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -45,12 +45,12 @@
// buffer size for temporary input streams
protected static final int bisBufferSize = 4096;
- final AudioFileFormat.Type types[];
+ final AudioFileFormat.Type[] types;
/**
* Constructs a new SunParser object.
*/
- SunFileWriter(AudioFileFormat.Type types[]) {
+ SunFileWriter(AudioFileFormat.Type[] types) {
this.types = types;
}
@@ -164,12 +164,12 @@
}
@Override
- public int read(byte b[]) throws IOException {
+ public int read(byte[] b) throws IOException {
return in.read(b);
}
@Override
- public int read(byte b[], int off, int len) throws IOException {
+ public int read(byte[] b, int off, int len) throws IOException {
return in.read(b, off, len);
}
--- a/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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,7 +47,7 @@
private static final byte[] ULAW_TABH = new byte[256];
private static final byte[] ULAW_TABL = new byte[256];
- private static final short seg_end[] = {
+ private static final short[] seg_end = {
0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF
};
@@ -83,7 +83,7 @@
public AudioFormat.Encoding[] getTargetEncodings(AudioFormat sourceFormat){
if( AudioFormat.Encoding.PCM_SIGNED.equals(sourceFormat.getEncoding()) ) {
if( sourceFormat.getSampleSizeInBits() == 16 ) {
- AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+ AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
enc[0] = AudioFormat.Encoding.ULAW;
return enc;
} else {
@@ -91,7 +91,7 @@
}
} else if (AudioFormat.Encoding.ULAW.equals(sourceFormat.getEncoding())) {
if (sourceFormat.getSampleSizeInBits() == 8) {
- AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+ AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
enc[0] = AudioFormat.Encoding.PCM_SIGNED;
return enc;
} else {
@@ -234,7 +234,7 @@
private final class UlawCodecStream extends AudioInputStream {
private static final int tempBufferSize = 64;
- private byte tempBuffer [] = null;
+ private byte[] tempBuffer = null;
/**
* True to encode to u-law, false to decode to linear.
@@ -244,8 +244,8 @@
AudioFormat encodeFormat;
AudioFormat decodeFormat;
- byte tabByte1[] = null;
- byte tabByte2[] = null;
+ byte[] tabByte1 = null;
+ byte[] tabByte2 = null;
int highByte = 0;
int lowByte = 1;
@@ -305,7 +305,7 @@
* $$jb 2/23/99
* Used to determine segment number in uLaw encoding
*/
- private short search(short val, short table[], short size) {
+ private short search(short val, short[] table, short size) {
for(short i = 0; i < size; i++) {
if (val <= table[i]) { return i; }
}
--- a/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -215,7 +215,7 @@
int bytesRead = 0;
int bytesWritten = 0;
InputStream fileStream = getFileStream(waveFileFormat, in);
- byte buffer[] = new byte[bisBufferSize];
+ byte[] buffer = new byte[bisBufferSize];
int maxLength = waveFileFormat.getByteLength();
while( (bytesRead = fileStream.read( buffer )) >= 0 ) {
--- a/src/java.desktop/share/classes/java/awt/AWTEvent.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/AWTEvent.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -87,7 +87,7 @@
*/
public abstract class AWTEvent extends EventObject {
- private byte bdata[];
+ private byte[] bdata;
/**
* The event's id.
--- a/src/java.desktop/share/classes/java/awt/BasicStroke.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/BasicStroke.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -157,7 +157,7 @@
int cap;
float miterlimit;
- float dash[];
+ float[] dash;
float dash_phase;
/**
@@ -189,7 +189,7 @@
*/
@ConstructorProperties({ "lineWidth", "endCap", "lineJoin", "miterLimit", "dashArray", "dashPhase" })
public BasicStroke(float width, int cap, int join, float miterlimit,
- float dash[], float dash_phase) {
+ float[] dash, float dash_phase) {
if (width < 0.0f) {
throw new IllegalArgumentException("negative width");
}
--- a/src/java.desktop/share/classes/java/awt/BufferCapabilities.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/BufferCapabilities.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -154,7 +154,7 @@
private static int I_PRIOR = 2;
private static int I_COPIED = 3;
- private static final String NAMES[] =
+ private static final String[] NAMES =
{ "undefined", "background", "prior", "copied" };
/**
--- a/src/java.desktop/share/classes/java/awt/Color.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Color.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -219,7 +219,7 @@
* @see #getRGBColorComponents
* @see #getRGBComponents
*/
- private float frgbvalue[] = null;
+ private float[] frgbvalue = null;
/**
* The color value in the native {@code ColorSpace} as
@@ -231,7 +231,7 @@
* @see #getRGBColorComponents
* @see #getRGBComponents
*/
- private float fvalue[] = null;
+ private float[] fvalue = null;
/**
* The alpha value as a {@code float} component.
@@ -514,7 +514,7 @@
* @see #getComponents
* @see #getColorComponents
*/
- public Color(ColorSpace cspace, float components[], float alpha) {
+ public Color(ColorSpace cspace, float[] components, float alpha) {
boolean rangeError = false;
String badComponentString = "";
int n = cspace.getNumComponents();
@@ -1110,7 +1110,7 @@
if (cs == null) {
cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
}
- float f[];
+ float[] f;
if (fvalue == null) {
f = new float[3];
f[0] = ((float)getRed())/255f;
@@ -1119,8 +1119,8 @@
} else {
f = fvalue;
}
- float tmp[] = cs.toCIEXYZ(f);
- float tmpout[] = cspace.fromCIEXYZ(tmp);
+ float[] tmp = cs.toCIEXYZ(f);
+ float[] tmpout = cspace.fromCIEXYZ(tmp);
if (compArray == null) {
compArray = new float[tmpout.length + 1];
}
@@ -1154,7 +1154,7 @@
if (cs == null) {
cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
}
- float f[];
+ float[] f;
if (fvalue == null) {
f = new float[3];
f[0] = ((float)getRed())/255f;
@@ -1163,8 +1163,8 @@
} else {
f = fvalue;
}
- float tmp[] = cs.toCIEXYZ(f);
- float tmpout[] = cspace.fromCIEXYZ(tmp);
+ float[] tmp = cs.toCIEXYZ(f);
+ float[] tmpout = cspace.fromCIEXYZ(tmp);
if (compArray == null) {
return tmpout;
}
--- a/src/java.desktop/share/classes/java/awt/Cursor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Cursor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -119,7 +119,7 @@
* method should be used instead.
*/
@Deprecated
- protected static Cursor predefined[] = new Cursor[14];
+ protected static Cursor[] predefined = new Cursor[14];
/**
* This field is a private replacement for 'predefined' array.
--- a/src/java.desktop/share/classes/java/awt/Event.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Event.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -550,7 +550,7 @@
public Event evt;
/* table for mapping old Event action keys to KeyEvent virtual keys. */
- private static final int actionKeyCodes[][] = {
+ private static final int[][] actionKeyCodes = {
/* virtual key action key */
{ KeyEvent.VK_HOME, Event.HOME },
{ KeyEvent.VK_END, Event.END },
--- a/src/java.desktop/share/classes/java/awt/FileDialog.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/FileDialog.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -147,7 +147,7 @@
static {
AWTAccessor.setFileDialogAccessor(
new AWTAccessor.FileDialogAccessor() {
- public void setFiles(FileDialog fileDialog, File files[]) {
+ public void setFiles(FileDialog fileDialog, File[] files) {
fileDialog.setFiles(files);
}
public void setFile(FileDialog fileDialog, String file) {
@@ -497,7 +497,7 @@
* @see #getFiles
* @since 1.7
*/
- private void setFiles(File files[]) {
+ private void setFiles(File[] files) {
synchronized (getObjectLock()) {
this.files = files;
}
--- a/src/java.desktop/share/classes/java/awt/Font.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Font.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -2011,7 +2011,7 @@
public Attribute[] getAvailableAttributes() {
// FONT is not supported by Font
- Attribute attributes[] = {
+ Attribute[] attributes = {
TextAttribute.FAMILY,
TextAttribute.WEIGHT,
TextAttribute.WIDTH,
--- a/src/java.desktop/share/classes/java/awt/FontMetrics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/FontMetrics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -332,7 +332,7 @@
if (ch < 256) {
return getWidths()[ch];
}
- char data[] = {ch};
+ char[] data = {ch};
return charsWidth(data, 0, 1);
}
@@ -355,7 +355,7 @@
*/
public int stringWidth(String str) {
int len = str.length();
- char data[] = new char[len];
+ char[] data = new char[len];
str.getChars(0, len, data, 0);
return charsWidth(data, 0, len);
}
@@ -383,7 +383,7 @@
* @see #bytesWidth(byte[], int, int)
* @see #stringWidth(String)
*/
- public int charsWidth(char data[], int off, int len) {
+ public int charsWidth(char[] data, int off, int len) {
return stringWidth(new String(data, off, len));
}
@@ -410,7 +410,7 @@
* @see #stringWidth(String)
*/
@SuppressWarnings("deprecation")
- public int bytesWidth(byte data[], int off, int len) {
+ public int bytesWidth(byte[] data, int off, int len) {
return stringWidth(new String(data, 0, off, len));
}
@@ -426,7 +426,7 @@
* described by this {@code FontMetrics} object.
*/
public int[] getWidths() {
- int widths[] = new int[256];
+ int[] widths = new int[256];
for (char ch = 0 ; ch < 256 ; ch++) {
widths[ch] = charWidth(ch);
}
--- a/src/java.desktop/share/classes/java/awt/GradientPaintContext.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/GradientPaintContext.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -84,7 +84,7 @@
double dx;
double dy;
boolean cyclic;
- int interp[];
+ int[] interp;
Raster saved;
ColorModel model;
--- a/src/java.desktop/share/classes/java/awt/Graphics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Graphics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -696,7 +696,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since 1.1
*/
- public abstract void drawPolyline(int xPoints[], int yPoints[],
+ public abstract void drawPolyline(int[] xPoints, int[] yPoints,
int nPoints);
/**
@@ -718,7 +718,7 @@
* @see java.awt.Graphics#fillPolygon
* @see java.awt.Graphics#drawPolyline
*/
- public abstract void drawPolygon(int xPoints[], int yPoints[],
+ public abstract void drawPolygon(int[] xPoints, int[] yPoints,
int nPoints);
/**
@@ -752,7 +752,7 @@
* @param nPoints a the total number of points.
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
*/
- public abstract void fillPolygon(int xPoints[], int yPoints[],
+ public abstract void fillPolygon(int[] xPoints, int[] yPoints,
int nPoints);
/**
@@ -818,7 +818,7 @@
* @see java.awt.Graphics#drawBytes
* @see java.awt.Graphics#drawString
*/
- public void drawChars(char data[], int offset, int length, int x, int y) {
+ public void drawChars(char[] data, int offset, int length, int x, int y) {
drawString(new String(data, offset, length), x, y);
}
@@ -844,7 +844,7 @@
* @see java.awt.Graphics#drawString
*/
@SuppressWarnings("deprecation")
- public void drawBytes(byte data[], int offset, int length, int x, int y) {
+ public void drawBytes(byte[] data, int offset, int length, int x, int y) {
drawString(new String(data, 0, offset, length), x, y);
}
--- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -84,7 +84,7 @@
*
* Use {@code GridBagConstraints.RELATIVE} to specify
* that the component's display area will be from {@code gridx}
- * to the next to the last cell in its row (for {@code gridwidth}
+ * to the next to the last cell in its row (for {@code gridwidth})
* or from {@code gridy} to the next to the last cell in its
* column (for {@code gridheight}).
*
@@ -442,7 +442,7 @@
* @serial
* @see #getLayoutDimensions()
*/
- public int columnWidths[];
+ public int[] columnWidths;
/**
* This field holds the overrides to the row minimum
@@ -456,7 +456,7 @@
* @serial
* @see #getLayoutDimensions()
*/
- public int rowHeights[];
+ public int[] rowHeights;
/**
* This field holds the overrides to the column weights.
@@ -471,7 +471,7 @@
*
* @serial
*/
- public double columnWeights[];
+ public double[] columnWeights;
/**
* This field holds the overrides to the row weights.
@@ -486,7 +486,7 @@
*
* @serial
*/
- public double rowWeights[];
+ public double[] rowWeights;
/**
* The component being positioned. This is set before calling into
@@ -592,7 +592,7 @@
if (layoutInfo == null)
return new int[2][0];
- int dim[][] = new int [2][];
+ int[][] dim = new int [2][];
dim[0] = new int[layoutInfo.width];
dim[1] = new int[layoutInfo.height];
@@ -618,7 +618,7 @@
if (layoutInfo == null)
return new double[2][0];
- double weights[][] = new double [2][];
+ double[][] weights = new double [2][];
weights[0] = new double[layoutInfo.width];
weights[1] = new double[layoutInfo.height];
@@ -929,7 +929,7 @@
*/
private long[] preInitMaximumArraySizes(Container parent){
- Component components[] = parent.getComponents();
+ Component[] components = parent.getComponents();
Component comp;
GridBagConstraints constraints;
int curX, curY;
@@ -1003,7 +1003,7 @@
Component comp;
GridBagConstraints constraints;
Dimension d;
- Component components[] = parent.getComponents();
+ Component[] components = parent.getComponents();
// Code below will address index curX+curWidth in the case of yMaxArray, weightY
// ( respectively curY+curHeight for xMaxArray, weightX ) where
// curX in 0 to preInitMaximumArraySizes.y
@@ -2063,7 +2063,7 @@
int compindex;
GridBagConstraints constraints;
Insets insets = parent.getInsets();
- Component components[] = parent.getComponents();
+ Component[] components = parent.getComponents();
Dimension d;
Rectangle r = new Rectangle();
int i, diffw, diffh;
--- a/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -42,20 +42,20 @@
int width, height; /* number of cells: horizontal and vertical */
int startx, starty; /* starting point for layout */
- int minWidth[]; /* largest minWidth in each column */
- int minHeight[]; /* largest minHeight in each row */
- double weightX[]; /* largest weight in each column */
- double weightY[]; /* largest weight in each row */
+ int[] minWidth; /* largest minWidth in each column */
+ int[] minHeight; /* largest minHeight in each row */
+ double[] weightX; /* largest weight in each column */
+ double[] weightY; /* largest weight in each row */
boolean hasBaseline; /* Whether or not baseline layout has been
* requested and one of the components
* has a valid baseline. */
// These are only valid if hasBaseline is true and are indexed by
// row.
- short baselineType[]; /* The type of baseline for a particular
+ short[] baselineType; /* The type of baseline for a particular
* row. A mix of the BaselineResizeBehavior
* constants (1 << ordinal()) */
- int maxAscent[]; /* Max ascent (baseline). */
- int maxDescent[]; /* Max descent (height - baseline) */
+ int[] maxAscent; /* Max ascent (baseline). */
+ int[] maxDescent; /* Max descent (height - baseline) */
/**
* Creates an instance of GridBagLayoutInfo representing {@code GridBagLayout}
--- a/src/java.desktop/share/classes/java/awt/JobAttributes.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/JobAttributes.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -67,7 +67,7 @@
private static final int I_RANGE = 1;
private static final int I_SELECTION = 2;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"all", "range", "selection"
};
@@ -103,7 +103,7 @@
private static final int I_FILE = 0;
private static final int I_PRINTER = 1;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"file", "printer"
};
@@ -134,7 +134,7 @@
private static final int I_NATIVE = 1;
private static final int I_NONE = 2;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"common", "native", "none"
};
@@ -170,7 +170,7 @@
private static final int I_SEPARATE_DOCUMENTS_COLLATED_COPIES = 0;
private static final int I_SEPARATE_DOCUMENTS_UNCOLLATED_COPIES = 1;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"separate-documents-collated-copies",
"separate-documents-uncollated-copies"
};
@@ -207,7 +207,7 @@
private static final int I_TWO_SIDED_LONG_EDGE = 1;
private static final int I_TWO_SIDED_SHORT_EDGE = 2;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"one-sided", "two-sided-long-edge", "two-sided-short-edge"
};
--- a/src/java.desktop/share/classes/java/awt/List.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/List.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -152,7 +152,7 @@
* @see #getSelectedIndexes()
* @see #getSelectedIndex()
*/
- int selected[] = new int[0];
+ int[] selected = new int[0];
/**
* This variable contains the value that will be used
@@ -321,7 +321,7 @@
* @since 1.1
*/
public synchronized String[] getItems() {
- String itemCopies[] = new String[items.size()];
+ String[] itemCopies = new String[items.size()];
items.copyInto(itemCopies);
return itemCopies;
}
@@ -488,7 +488,7 @@
* @see #isIndexSelected
*/
public synchronized int getSelectedIndex() {
- int sel[] = getSelectedIndexes();
+ int[] sel = getSelectedIndexes();
return (sel.length == 1) ? sel[0] : -1;
}
@@ -534,8 +534,8 @@
* @see #isIndexSelected
*/
public synchronized String[] getSelectedItems() {
- int sel[] = getSelectedIndexes();
- String str[] = new String[sel.length];
+ int[] sel = getSelectedIndexes();
+ String[] str = new String[sel.length];
for (int i = 0 ; i < sel.length ; i++) {
str[i] = getItem(sel[i]);
}
@@ -602,7 +602,7 @@
selected = new int[1];
selected[0] = index;
} else {
- int newsel[] = new int[selected.length + 1];
+ int[] newsel = new int[selected.length + 1];
System.arraycopy(selected, 0, newsel, 0,
selected.length);
newsel[selected.length] = index;
@@ -636,7 +636,7 @@
for (int i = 0 ; i < selected.length ; i++) {
if (selected[i] == index) {
- int newsel[] = new int[selected.length - 1];
+ int[] newsel = new int[selected.length - 1];
System.arraycopy(selected, 0, newsel, 0, i);
System.arraycopy(selected, i+1, newsel, i, selected.length - (i+1));
selected = newsel;
@@ -669,7 +669,7 @@
*/
@Deprecated
public boolean isSelected(int index) {
- int sel[] = getSelectedIndexes();
+ int[] sel = getSelectedIndexes();
for (int i = 0 ; i < sel.length ; i++) {
if (sel[i] == index) {
return true;
@@ -1493,7 +1493,7 @@
*/
public void clearAccessibleSelection() {
synchronized(List.this) {
- int selectedIndexes[] = List.this.getSelectedIndexes();
+ int[] selectedIndexes = List.this.getSelectedIndexes();
if (selectedIndexes == null)
return;
for (int i = selectedIndexes.length - 1; i >= 0; i--) {
--- a/src/java.desktop/share/classes/java/awt/MediaTracker.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/MediaTracker.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -369,7 +369,7 @@
if (numerrors == 0) {
return null;
}
- Object errors[] = new Object[numerrors];
+ Object[] errors = new Object[numerrors];
cur = head;
numerrors = 0;
while (cur != null) {
@@ -598,7 +598,7 @@
if (numerrors == 0) {
return null;
}
- Object errors[] = new Object[numerrors];
+ Object[] errors = new Object[numerrors];
cur = head;
numerrors = 0;
while (cur != null) {
--- a/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -118,8 +118,8 @@
private int transparencyTest;
/** Color space conversion lookup tables. */
- private static final int SRGBtoLinearRGB[] = new int[256];
- private static final int LinearRGBtoSRGB[] = new int[256];
+ private static final int[] SRGBtoLinearRGB = new int[256];
+ private static final int[] LinearRGBtoSRGB = new int[256];
static {
// build the tables
@@ -187,7 +187,7 @@
// (incorrect) results than to throw an exception and/or no-op
tInv = new AffineTransform();
}
- double m[] = new double[6];
+ double[] m = new double[6];
tInv.getMatrix(m);
a00 = (float)m[0];
a10 = (float)m[1];
@@ -651,7 +651,7 @@
return raster;
}
- protected abstract void fillRaster(int pixels[], int off, int adjust,
+ protected abstract void fillRaster(int[] pixels, int off, int adjust,
int x, int y, int w, int h);
--- a/src/java.desktop/share/classes/java/awt/PageAttributes.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/PageAttributes.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -67,7 +67,7 @@
private static final int I_COLOR = 0;
private static final int I_MONOCHROME = 1;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"color", "monochrome"
};
@@ -167,7 +167,7 @@
private static final int I_MONARCH_ENVELOPE = 73;
private static final int I_PERSONAL_ENVELOPE = 74;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"iso-4a0", "iso-2a0", "iso-a0", "iso-a1", "iso-a2", "iso-a3",
"iso-a4", "iso-a5", "iso-a6", "iso-a7", "iso-a8", "iso-a9",
"iso-a10", "iso-b0", "iso-b1", "iso-b2", "iso-b3", "iso-b4",
@@ -812,7 +812,7 @@
private static final int I_PORTRAIT = 0;
private static final int I_LANDSCAPE = 1;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"portrait", "landscape"
};
@@ -842,7 +842,7 @@
private static final int I_PHYSICAL = 0;
private static final int I_PRINTABLE = 1;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"physical", "printable"
};
@@ -870,7 +870,7 @@
private static final int I_NORMAL = 1;
private static final int I_DRAFT = 2;
- private static final String NAMES[] = {
+ private static final String[] NAMES = {
"high", "normal", "draft"
};
--- a/src/java.desktop/share/classes/java/awt/Polygon.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Polygon.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -82,7 +82,7 @@
* @see #addPoint(int, int)
* @since 1.0
*/
- public int xpoints[];
+ public int[] xpoints;
/**
* The array of Y coordinates. The number of elements in
@@ -96,7 +96,7 @@
* @see #addPoint(int, int)
* @since 1.0
*/
- public int ypoints[];
+ public int[] ypoints;
/**
* The bounds of this {@code Polygon}.
@@ -144,7 +144,7 @@
* {@code ypoints} is {@code null}.
* @since 1.0
*/
- public Polygon(int xpoints[], int ypoints[], int npoints) {
+ public Polygon(int[] xpoints, int[] ypoints, int npoints) {
// Fix 4489009: should throw IndexOutOfBoundsException instead
// of OutOfMemoryError if npoints is huge and > {x,y}points.length
if (npoints > xpoints.length || npoints > ypoints.length) {
@@ -226,7 +226,7 @@
* @param ypoints[] array of <i>y</i> coordinates
* @param npoints the total number of points
*/
- void calculateBounds(int xpoints[], int ypoints[], int npoints) {
+ void calculateBounds(int[] xpoints, int[] ypoints, int npoints) {
int boundsMinX = Integer.MAX_VALUE;
int boundsMinY = Integer.MAX_VALUE;
int boundsMaxX = Integer.MIN_VALUE;
--- a/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -170,7 +170,7 @@
* @param x,y,w,h the area in device space for which colors are
* generated.
*/
- protected void fillRaster(int pixels[], int off, int adjust,
+ protected void fillRaster(int[] pixels, int off, int adjust,
int x, int y, int w, int h)
{
if (isSimpleFocus && isNonCyclic && isSimpleLookup) {
@@ -185,7 +185,7 @@
* point, the gradient is noncyclic, and the gradient lookup method is
* fast (single array index, no conversion necessary).
*/
- private void simpleNonCyclicFillRaster(int pixels[], int off, int adjust,
+ private void simpleNonCyclicFillRaster(int[] pixels, int off, int adjust,
int x, int y, int w, int h)
{
/* We calculate sqrt(X^2 + Y^2) relative to the radius
@@ -301,7 +301,7 @@
// SQRT_LUT_SIZE must be a power of 2 for the test above to work.
private static final int SQRT_LUT_SIZE = (1 << 11);
- private static float sqrtLut[] = new float[SQRT_LUT_SIZE+1];
+ private static float[] sqrtLut = new float[SQRT_LUT_SIZE+1];
static {
for (int i = 0; i < sqrtLut.length; i++) {
sqrtLut[i] = (float) Math.sqrt(i / ((float) SQRT_LUT_SIZE));
@@ -327,7 +327,7 @@
* formula produces the following set of equations. Constant factors have
* been extracted out of the inner loop.
*/
- private void cyclicCircularGradientFillRaster(int pixels[], int off,
+ private void cyclicCircularGradientFillRaster(int[] pixels, int off,
int adjust,
int x, int y,
int w, int h)
--- a/src/java.desktop/share/classes/java/awt/Robot.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Robot.java Wed Oct 24 13:35:18 2018 +0530
@@ -511,7 +511,7 @@
AffineTransform tx = gc.getDefaultTransform();
double uiScaleX = tx.getScaleX();
double uiScaleY = tx.getScaleY();
- int pixels[];
+ int[] pixels;
if (uiScaleX == 1 && uiScaleY == 1) {
@@ -537,7 +537,7 @@
int sY = (int) Math.floor(screenRect.y * uiScaleY);
int sWidth = (int) Math.ceil(screenRect.width * uiScaleX);
int sHeight = (int) Math.ceil(screenRect.height * uiScaleY);
- int temppixels[];
+ int[] temppixels;
Rectangle scaledRect = new Rectangle(sX, sY, sWidth, sHeight);
temppixels = peer.getRGBPixels(scaledRect);
--- a/src/java.desktop/share/classes/java/awt/SystemColor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/SystemColor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -431,7 +431,7 @@
*/
private transient int index;
- private static SystemColor systemColorObjects [] = {
+ private static SystemColor[] systemColorObjects = {
SystemColor.desktop,
SystemColor.activeCaption,
SystemColor.activeCaptionText,
--- a/src/java.desktop/share/classes/java/awt/TexturePaintContext.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/TexturePaintContext.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -335,7 +335,7 @@
* pixels to blend, when the error values reach 1.0 we move to the
* next pixel and reset them to 0.0.
*/
- public static int blend(int rgbs[], int xmul, int ymul) {
+ public static int blend(int[] rgbs, int xmul, int ymul) {
// xmul/ymul are 31 bits wide, (0 => 2^31-1)
// shift them to 12 bits wide, (0 => 2^12-1)
xmul = (xmul >>> 19);
@@ -372,10 +372,10 @@
static class Int extends TexturePaintContext {
IntegerInterleavedRaster srcRas;
- int inData[];
+ int[] inData;
int inOff;
int inSpan;
- int outData[];
+ int[] outData;
int outOff;
int outSpan;
boolean filter;
@@ -422,7 +422,7 @@
if (normalx) {
outSpan -= w;
}
- int rgbs[] = filter ? new int[4] : null;
+ int[] rgbs = filter ? new int[4] : null;
for (int j = 0; j < h; j++) {
if (normalx) {
int in = inOff + rowy * inSpan + bWidth;
@@ -508,10 +508,10 @@
static class Byte extends TexturePaintContext {
ByteInterleavedRaster srcRas;
- byte inData[];
+ byte[] inData;
int inOff;
int inSpan;
- byte outData[];
+ byte[] outData;
int outOff;
int outSpan;
@@ -628,11 +628,11 @@
static class ByteFilter extends TexturePaintContext {
ByteInterleavedRaster srcRas;
- int inPalette[];
- byte inData[];
+ int[] inPalette;
+ byte[] inData;
int inOff;
int inSpan;
- int outData[];
+ int[] outData;
int outOff;
int outSpan;
@@ -677,7 +677,7 @@
int rowy = y;
int rowxerr = xerr;
int rowyerr = yerr;
- int rgbs[] = new int[4];
+ int[] rgbs = new int[4];
for (int j = 0; j < h; j++) {
x = rowx;
y = rowy;
@@ -764,7 +764,7 @@
int rowyerr = yerr;
WritableRaster srcRas = this.srcRas;
WritableRaster outRas = this.outRas;
- int rgbs[] = filter ? new int[4] : null;
+ int[] rgbs = filter ? new int[4] : null;
for (int j = 0; j < h; j++) {
x = rowx;
y = rowy;
--- a/src/java.desktop/share/classes/java/awt/Window.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/Window.java Wed Oct 24 13:35:18 2018 +0530
@@ -1477,7 +1477,7 @@
return getOwnedWindows_NoClientCode();
}
final Window[] getOwnedWindows_NoClientCode() {
- Window realCopy[];
+ Window[] realCopy;
synchronized(ownedWindowList) {
// Recall that ownedWindowList is actually a Vector of
@@ -1487,7 +1487,7 @@
// all non-null get()s (realCopy with size realSize).
int fullSize = ownedWindowList.size();
int realSize = 0;
- Window fullCopy[] = new Window[fullSize];
+ Window[] fullCopy = new Window[fullSize];
for (int i = 0; i < fullSize; i++) {
fullCopy[realSize] = ownedWindowList.elementAt(i).get();
@@ -1555,14 +1555,14 @@
private static Window[] getWindows(AppContext appContext) {
synchronized (Window.class) {
- Window realCopy[];
+ Window[] realCopy;
@SuppressWarnings("unchecked")
Vector<WeakReference<Window>> windowList =
(Vector<WeakReference<Window>>)appContext.get(Window.class);
if (windowList != null) {
int fullSize = windowList.size();
int realSize = 0;
- Window fullCopy[] = new Window[fullSize];
+ Window[] fullCopy = new Window[fullSize];
for (int i = 0; i < fullSize; i++) {
Window w = windowList.get(i).get();
if (w != null) {
--- a/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -186,7 +186,7 @@
}
int nc = this.getNumComponents();
- short tmp[] = new short[nc];
+ short[] tmp = new short[nc];
for (int i = 0; i < nc; i++) {
tmp[i] = (short)
((colorvalue[i] - minVal[i]) * invDiffMinMax[i] + 0.5f);
@@ -237,7 +237,7 @@
}
}
- short tmp[] = new short[3];
+ short[] tmp = new short[3];
for (int i = 0; i < 3; i++) {
tmp[i] = (short) ((rgbvalue[i] * 65535.0f) + 0.5f);
}
@@ -379,7 +379,7 @@
}
int nc = this.getNumComponents();
- short tmp[] = new short[nc];
+ short[] tmp = new short[nc];
for (int i = 0; i < nc; i++) {
tmp[i] = (short)
((colorvalue[i] - minVal[i]) * invDiffMinMax[i] + 0.5f);
@@ -522,7 +522,7 @@
}
}
- short tmp[] = new short[3];
+ short[] tmp = new short[3];
float ALMOST_TWO = 1.0f + (32767.0f / 32768.0f);
float factor = 65535.0f / ALMOST_TWO;
// For CIEXYZ, min = 0.0, max = ALMOST_TWO for all components
--- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1016,7 +1016,7 @@
* contain valid ICC Profile data.
*/
public static ICC_Profile getInstance(InputStream s) throws IOException {
- byte profileData[];
+ byte[] profileData;
if (s instanceof ProfileDeferralInfo) {
/* hack to detect profiles whose loading can be deferred */
@@ -1032,10 +1032,10 @@
static byte[] getProfileDataFromStream(InputStream s) throws IOException {
- byte profileData[];
+ byte[] profileData;
int profileSize;
- byte header[] = new byte[128];
+ byte[] header = new byte[128];
int bytestoread = 128;
int bytesread = 0;
int n;
@@ -1098,7 +1098,7 @@
void activateDeferredProfile() throws ProfileDataException {
- byte profileData[];
+ byte[] profileData;
final String fileName = deferralInfo.filename;
profileActivator = null;
@@ -1286,7 +1286,7 @@
*/
public void write(String fileName) throws IOException {
FileOutputStream outputFile;
- byte profileData[];
+ byte[] profileData;
profileData = getData(); /* this will activate deferred
profiles if necessary */
@@ -1305,7 +1305,7 @@
* stream.
*/
public void write(OutputStream s) throws IOException {
- byte profileData[];
+ byte[] profileData;
profileData = getData(); /* this will activate deferred
profiles if necessary */
--- a/src/java.desktop/share/classes/java/awt/font/TextLine.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/font/TextLine.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -1293,7 +1293,7 @@
/*
* The new version requires that chunks be at the same level.
*/
- private static int firstVisualChunk(int order[], byte direction[],
+ private static int firstVisualChunk(int[] order, byte[] direction,
int start, int limit)
{
if (order != null && direction != null) {
--- a/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -1344,7 +1344,7 @@
// Utility methods to optimize rotate methods.
// These tables translate the flags during predictable quadrant
// rotations where the shear and scale values are swapped and negated.
- private static final int rot90conversion[] = {
+ private static final int[] rot90conversion = {
/* IDENTITY => */ APPLY_SHEAR,
/* TRANSLATE (TR) => */ APPLY_SHEAR | APPLY_TRANSLATE,
/* SCALE (SC) => */ APPLY_SHEAR,
--- a/src/java.desktop/share/classes/java/awt/geom/Area.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/Area.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -144,7 +144,7 @@
// 0-2 horizontal splitting parameters
// OR
// 3 parametric equation derivative coefficients
- double coords[] = new double[23];
+ double[] coords = new double[23];
double movx = 0, movy = 0;
double curx = 0, cury = 0;
double newx, newy;
@@ -702,8 +702,8 @@
}
}
- public int currentSegment(float coords[]) {
- double dcoords[] = new double[6];
+ public int currentSegment(float[] coords) {
+ double[] dcoords = new double[6];
int segtype = currentSegment(dcoords);
int numpoints = (segtype == SEG_CLOSE ? 0
: (segtype == SEG_QUADTO ? 2
@@ -715,7 +715,7 @@
return segtype;
}
- public int currentSegment(double coords[]) {
+ public int currentSegment(double[] coords) {
int segtype;
int numpoints;
if (prevcurve != null) {
--- a/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -860,7 +860,7 @@
* the specified offset.
* @since 1.2
*/
- public static double getFlatnessSq(double coords[], int offset) {
+ public static double getFlatnessSq(double[] coords, int offset) {
return getFlatnessSq(coords[offset + 0], coords[offset + 1],
coords[offset + 2], coords[offset + 3],
coords[offset + 4], coords[offset + 5],
@@ -880,7 +880,7 @@
* the specified offset.
* @since 1.2
*/
- public static double getFlatness(double coords[], int offset) {
+ public static double getFlatness(double[] coords, int offset) {
return getFlatness(coords[offset + 0], coords[offset + 1],
coords[offset + 2], coords[offset + 3],
coords[offset + 4], coords[offset + 5],
@@ -1000,9 +1000,9 @@
* the 6 right coordinates
* @since 1.2
*/
- public static void subdivide(double src[], int srcoff,
- double left[], int leftoff,
- double right[], int rightoff) {
+ public static void subdivide(double[] src, int srcoff,
+ double[] left, int leftoff,
+ double[] right, int rightoff) {
double x1 = src[srcoff + 0];
double y1 = src[srcoff + 1];
double ctrlx1 = src[srcoff + 2];
@@ -1065,7 +1065,7 @@
* @return the number of roots, or -1 if the equation is a constant.
* @since 1.2
*/
- public static int solveCubic(double eqn[]) {
+ public static int solveCubic(double[] eqn) {
return solveCubic(eqn, eqn);
}
@@ -1086,7 +1086,7 @@
* @return the number of roots, or -1 if the equation is a constant
* @since 1.3
*/
- public static int solveCubic(double eqn[], double res[]) {
+ public static int solveCubic(double[] eqn, double[] res) {
// From Graphics Gems:
// http://tog.acm.org/resources/GraphicsGems/gems/Roots3And4.c
final double d = eqn[3];
@@ -1369,7 +1369,7 @@
return (x1 < 0 && x2 > 0) || (x1 > 0 && x2 < 0);
}
- private static double solveEqn(double eqn[], int order, double t) {
+ private static double solveEqn(double[] eqn, int order, double t) {
double v = eqn[order];
while (--order >= 0) {
v = v * t + eqn[order];
--- a/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -86,7 +86,7 @@
*/
private static final double pcv = 0.5 + CtrlVal * 0.5;
private static final double ncv = 0.5 - CtrlVal * 0.5;
- private static double ctrlpts[][] = {
+ private static double[][] ctrlpts = {
{ 1.0, pcv, pcv, 1.0, 0.5, 1.0 },
{ ncv, 1.0, 0.0, pcv, 0.0, 0.5 },
{ 0.0, ncv, ncv, 0.0, 0.5, 0.0 },
@@ -119,7 +119,7 @@
return SEG_CLOSE;
}
if (index == 0) {
- double ctrls[] = ctrlpts[3];
+ double[] ctrls = ctrlpts[3];
coords[0] = (float) (x + ctrls[4] * w);
coords[1] = (float) (y + ctrls[5] * h);
if (affine != null) {
@@ -127,7 +127,7 @@
}
return SEG_MOVETO;
}
- double ctrls[] = ctrlpts[index - 1];
+ double[] ctrls = ctrlpts[index - 1];
coords[0] = (float) (x + ctrls[0] * w);
coords[1] = (float) (y + ctrls[1] * h);
coords[2] = (float) (x + ctrls[2] * w);
@@ -166,7 +166,7 @@
return SEG_CLOSE;
}
if (index == 0) {
- double ctrls[] = ctrlpts[3];
+ double[] ctrls = ctrlpts[3];
coords[0] = x + ctrls[4] * w;
coords[1] = y + ctrls[5] * h;
if (affine != null) {
@@ -174,7 +174,7 @@
}
return SEG_MOVETO;
}
- double ctrls[] = ctrlpts[index - 1];
+ double[] ctrls = ctrlpts[index - 1];
coords[0] = x + ctrls[0] * w;
coords[1] = y + ctrls[1] * h;
coords[2] = x + ctrls[2] * w;
--- a/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -45,7 +45,7 @@
int limit; // Maximum number of recursion levels
- double hold[] = new double[14]; // The cache of interpolated coords
+ double[] hold = new double[14]; // The cache of interpolated coords
// Note that this must be long enough
// to store a full cubic segment and
// a relative cubic segment to avoid
@@ -71,7 +71,7 @@
// returned in the next call to
// currentSegment().
- int levels[]; // The recursion level at which
+ int[] levels; // The recursion level at which
// each curve being held in storage
// was generated.
@@ -175,7 +175,7 @@
if (holdIndex - want < 0) {
int have = hold.length - holdIndex;
int newsize = hold.length + GROW_SIZE;
- double newhold[] = new double[newsize];
+ double[] newhold = new double[newsize];
System.arraycopy(hold, holdIndex,
newhold, holdIndex + GROW_SIZE,
have);
--- a/src/java.desktop/share/classes/java/awt/geom/Path2D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/Path2D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -187,7 +187,7 @@
* @since 1.6
*/
public static class Float extends Path2D implements Serializable {
- transient float floatCoords[];
+ transient float[] floatCoords;
/**
* Constructs a new empty single precision {@code Path2D} object
@@ -290,7 +290,7 @@
@Override
float[] cloneCoordsFloat(AffineTransform at) {
// trim arrays:
- float ret[];
+ float[] ret;
if (at == null) {
ret = Arrays.copyOf(floatCoords, numCoords);
} else {
@@ -303,7 +303,7 @@
@Override
double[] cloneCoordsDouble(AffineTransform at) {
// trim arrays:
- double ret[] = new double[numCoords];
+ double[] ret = new double[numCoords];
if (at == null) {
for (int i = 0; i < numCoords; i++) {
ret[i] = floatCoords[i];
@@ -555,7 +555,7 @@
return 0;
}
double movx, movy, curx, cury, endx, endy;
- float coords[] = floatCoords;
+ float[] coords = floatCoords;
curx = movx = coords[0];
cury = movy = coords[1];
int crossings = 0;
@@ -634,7 +634,7 @@
if (numTypes == 0) {
return 0;
}
- float coords[] = floatCoords;
+ float[] coords = floatCoords;
double curx, cury, movx, movy, endx, endy;
curx = movx = coords[0];
cury = movy = coords[1];
@@ -736,7 +736,7 @@
* @since 1.6
*/
public final void append(PathIterator pi, boolean connect) {
- float coords[] = new float[6];
+ float[] coords = new float[6];
while (!pi.isDone()) {
switch (pi.currentSegment(coords)) {
case SEG_MOVETO:
@@ -1004,7 +1004,7 @@
}
static class CopyIterator extends Path2D.Iterator {
- float floatCoords[];
+ float[] floatCoords;
CopyIterator(Path2D.Float p2df) {
super(p2df);
@@ -1034,7 +1034,7 @@
}
static class TxIterator extends Path2D.Iterator {
- float floatCoords[];
+ float[] floatCoords;
AffineTransform affine;
TxIterator(Path2D.Float p2df, AffineTransform at) {
@@ -1073,7 +1073,7 @@
* @since 1.6
*/
public static class Double extends Path2D implements Serializable {
- transient double doubleCoords[];
+ transient double[] doubleCoords;
/**
* Constructs a new empty double precision {@code Path2D} object
@@ -1176,7 +1176,7 @@
@Override
float[] cloneCoordsFloat(AffineTransform at) {
// trim arrays:
- float ret[] = new float[numCoords];
+ float[] ret = new float[numCoords];
if (at == null) {
for (int i = 0; i < numCoords; i++) {
ret[i] = (float) doubleCoords[i];
@@ -1190,7 +1190,7 @@
@Override
double[] cloneCoordsDouble(AffineTransform at) {
// trim arrays:
- double ret[];
+ double[] ret;
if (at == null) {
ret = Arrays.copyOf(doubleCoords, numCoords);
} else {
@@ -1330,7 +1330,7 @@
return 0;
}
double movx, movy, curx, cury, endx, endy;
- double coords[] = doubleCoords;
+ double[] coords = doubleCoords;
curx = movx = coords[0];
cury = movy = coords[1];
int crossings = 0;
@@ -1409,7 +1409,7 @@
if (numTypes == 0) {
return 0;
}
- double coords[] = doubleCoords;
+ double[] coords = doubleCoords;
double curx, cury, movx, movy, endx, endy;
curx = movx = coords[0];
cury = movy = coords[1];
@@ -1512,7 +1512,7 @@
* @since 1.6
*/
public final void append(PathIterator pi, boolean connect) {
- double coords[] = new double[6];
+ double[] coords = new double[6];
while (!pi.isDone()) {
switch (pi.currentSegment(coords)) {
case SEG_MOVETO:
@@ -1779,7 +1779,7 @@
}
static class CopyIterator extends Path2D.Iterator {
- double doubleCoords[];
+ double[] doubleCoords;
CopyIterator(Path2D.Double p2dd) {
super(p2dd);
@@ -1809,7 +1809,7 @@
}
static class TxIterator extends Path2D.Iterator {
- double doubleCoords[];
+ double[] doubleCoords;
AffineTransform affine;
TxIterator(Path2D.Double p2dd, AffineTransform at) {
@@ -2537,8 +2537,8 @@
{
s.defaultWriteObject();
- float fCoords[];
- double dCoords[];
+ float[] fCoords;
+ double[] dCoords;
if (isdbl) {
dCoords = ((Path2D.Double) this).doubleCoords;
@@ -2726,7 +2726,7 @@
int pointIdx;
Path2D path;
- static final int curvecoords[] = {2, 2, 4, 6, 0};
+ static final int[] curvecoords = {2, 2, 4, 6, 0};
Iterator(Path2D path) {
this.path = path;
--- a/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -664,7 +664,7 @@
* values in the specified array at the specified index.
* @since 1.2
*/
- public static double getFlatnessSq(double coords[], int offset) {
+ public static double getFlatnessSq(double[] coords, int offset) {
return Line2D.ptSegDistSq(coords[offset + 0], coords[offset + 1],
coords[offset + 4], coords[offset + 5],
coords[offset + 2], coords[offset + 3]);
@@ -682,7 +682,7 @@
* specified array at the specified offset.
* @since 1.2
*/
- public static double getFlatness(double coords[], int offset) {
+ public static double getFlatness(double[] coords, int offset) {
return Line2D.ptSegDist(coords[offset + 0], coords[offset + 1],
coords[offset + 4], coords[offset + 5],
coords[offset + 2], coords[offset + 3]);
@@ -797,9 +797,9 @@
* the 6 right coordinates
* @since 1.2
*/
- public static void subdivide(double src[], int srcoff,
- double left[], int leftoff,
- double right[], int rightoff) {
+ public static void subdivide(double[] src, int srcoff,
+ double[] left, int leftoff,
+ double[] right, int rightoff) {
double x1 = src[srcoff + 0];
double y1 = src[srcoff + 1];
double ctrlx = src[srcoff + 2];
@@ -851,7 +851,7 @@
* a constant
* @since 1.2
*/
- public static int solveQuadratic(double eqn[]) {
+ public static int solveQuadratic(double[] eqn) {
return solveQuadratic(eqn, eqn);
}
@@ -875,7 +875,7 @@
* a constant.
* @since 1.3
*/
- public static int solveQuadratic(double eqn[], double res[]) {
+ public static int solveQuadratic(double[] eqn, double[] res) {
double a = eqn[2];
double b = eqn[1];
double c = eqn[0];
@@ -1036,7 +1036,7 @@
* B = 2*CP - 2*C1
* A = C1 - 2*CP + C2
*/
- private static void fillEqn(double eqn[], double val,
+ private static void fillEqn(double[] eqn, double val,
double c1, double cp, double c2) {
eqn[0] = c1 - val;
eqn[1] = cp + cp - c1 - c1;
@@ -1053,10 +1053,10 @@
* then any points which represent a point of inflection for that
* quadratic equation are also ignored.
*/
- private static int evalQuadratic(double vals[], int num,
+ private static int evalQuadratic(double[] vals, int num,
boolean include0,
boolean include1,
- double inflect[],
+ double[] inflect,
double c1, double ctrl, double c2) {
int j = 0;
for (int i = 0; i < num; i++) {
--- a/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -90,7 +90,7 @@
// 4 values for each point {v0, v1, v2, v3}:
// point = (x + v0 * w + v1 * arcWidth,
// y + v2 * h + v3 * arcHeight);
- private static double ctrlpts[][] = {
+ private static double[][] ctrlpts = {
{ 0.0, 0.0, 0.0, 0.5 },
{ 0.0, 0.0, 1.0, -0.5 },
{ 0.0, 0.0, 1.0, -acv,
@@ -110,7 +110,7 @@
0.0, 0.0, 0.0, 0.5 },
{},
};
- private static int types[] = {
+ private static int[] types = {
SEG_MOVETO,
SEG_LINETO, SEG_CUBICTO,
SEG_LINETO, SEG_CUBICTO,
@@ -141,7 +141,7 @@
if (isDone()) {
throw new NoSuchElementException("roundrect iterator out of bounds");
}
- double ctrls[] = ctrlpts[index];
+ double[] ctrls = ctrlpts[index];
int nc = 0;
for (int i = 0; i < ctrls.length; i += 4) {
coords[nc++] = (float) (x + ctrls[i + 0] * w + ctrls[i + 1] * aw);
@@ -175,7 +175,7 @@
if (isDone()) {
throw new NoSuchElementException("roundrect iterator out of bounds");
}
- double ctrls[] = ctrlpts[index];
+ double[] ctrls = ctrlpts[index];
int nc = 0;
for (int i = 0; i < ctrls.length; i += 4) {
coords[nc++] = (x + ctrls[i + 0] * w + ctrls[i + 1] * aw);
--- a/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -63,7 +63,7 @@
| COMPLETESCANLINES);
private boolean passthrough;
- private float reds[], greens[], blues[], alphas[];
+ private float[] reds, greens, blues, alphas;
private int savedy;
private int savedyrem;
@@ -208,7 +208,7 @@
}
}
if ((dyrem -= amty) == 0) {
- int outpix[] = calcRow();
+ int[] outpix = calcRow();
do {
consumer.setPixels(0, dy, destWidth, 1,
rgbmodel, outpix, 0, destWidth);
@@ -244,7 +244,7 @@
* @see ReplicateScaleFilter
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, byte pixels[], int off,
+ ColorModel model, byte[] pixels, int off,
int scansize) {
if (passthrough) {
super.setPixels(x, y, w, h, model, pixels, off, scansize);
@@ -270,7 +270,7 @@
* @see ReplicateScaleFilter
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, int pixels[], int off,
+ ColorModel model, int[] pixels, int off,
int scansize) {
if (passthrough) {
super.setPixels(x, y, w, h, model, pixels, off, scansize);
--- a/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -106,8 +106,8 @@
public BandedSampleModel(int dataType,
int w, int h,
int scanlineStride,
- int bankIndices[],
- int bandOffsets[]) {
+ int[] bankIndices,
+ int[] bandOffsets) {
super(dataType, w, h, 1,scanlineStride, bankIndices, bandOffsets);
}
@@ -157,13 +157,13 @@
* @throws IllegalArgumentException if {@code dataType} is not
* one of the supported data types
*/
- public SampleModel createSubsetSampleModel(int bands[]) {
+ public SampleModel createSubsetSampleModel(int[] bands) {
if (bands.length > bankIndices.length)
throw new RasterFormatException("There are only " +
bankIndices.length +
" bands");
- int newBankIndices[] = new int[bands.length];
- int newBandOffsets[] = new int[bands.length];
+ int[] newBankIndices = new int[bands.length];
+ int[] newBandOffsets = new int[bands.length];
for (int i=0; i<bands.length; i++) {
newBankIndices[i] = bankIndices[bands[i]];
@@ -396,7 +396,7 @@
* @return the samples for the specified pixel.
* @see #setPixel(int, int, int[], DataBuffer)
*/
- public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+ public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
@@ -433,7 +433,7 @@
* @see #setPixels(int, int, int, int, int[], DataBuffer)
*/
public int[] getPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int x1 = x + w;
int y1 = y + h;
@@ -557,13 +557,13 @@
* @see #setSamples(int, int, int, int, int, int[], DataBuffer)
*/
public int[] getSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
// Bounds check for 'b' will be performed automatically
if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int samples[];
+ int[] samples;
if (iArray != null) {
samples = iArray;
} else {
@@ -694,7 +694,7 @@
* @param data The DataBuffer containing the image data
* @see #getPixel(int, int, int[], DataBuffer)
*/
- public void setPixel(int x, int y, int iArray[], DataBuffer data) {
+ public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
@@ -720,7 +720,7 @@
* @see #getPixels(int, int, int, int, int[], DataBuffer)
*/
public void setPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int x1 = x + w;
int y1 = y + h;
@@ -833,7 +833,7 @@
* @see #getSamples(int, int, int, int, int, int[], DataBuffer)
*/
public void setSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
// Bounds check for 'b' will be performed automatically
if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
throw new ArrayIndexOutOfBoundsException
--- a/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -127,7 +127,7 @@
private void convertToRGB() {
int size = width * height;
- int newpixels[] = new int[size];
+ int[] newpixels = new int[size];
if (bytePixels != null) {
for (int i = 0; i < size; i++) {
newpixels[i] = this.model.getRGB(bytePixels[i] & 0xff);
@@ -159,7 +159,7 @@
int, int)
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, byte pixels[], int off,
+ ColorModel model, byte[] pixels, int off,
int scansize) {
// Fix 4184230
if (w < 0 || h < 0) {
@@ -246,7 +246,7 @@
int, int)
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, int pixels[], int off,
+ ColorModel model, int[] pixels, int off,
int scansize) {
// Fix 4184230
if (w < 0 || h < 0) {
--- a/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -46,7 +46,7 @@
* Constants
*/
- byte data[][];
+ byte[][] data;
/**
* Constructs a ByteLookupTable object from an array of byte
@@ -63,7 +63,7 @@
* is less than 0 or if the length of {@code data}
* is less than 1
*/
- public ByteLookupTable(int offset, byte data[][]) {
+ public ByteLookupTable(int offset, byte[][] data) {
super(offset,data.length);
numComponents = data.length;
numEntries = data[0].length;
@@ -87,7 +87,7 @@
* is less than 0 or if the length of {@code data}
* is less than 1
*/
- public ByteLookupTable(int offset, byte data[]) {
+ public ByteLookupTable(int offset, byte[] data) {
super(offset,data.length);
numComponents = 1;
numEntries = data.length;
--- a/src/java.desktop/share/classes/java/awt/image/ColorModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ColorModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -160,7 +160,7 @@
* The total number of bits in the pixel.
*/
protected int pixel_bits;
- int nBits[];
+ int[] nBits;
int transparency = Transparency.TRANSLUCENT;
boolean supportsAlpha = true;
boolean isAlphaPremultiplied = false;
@@ -645,17 +645,17 @@
int pixel=0,length=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
length = bdata.length;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
length = sdata.length;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
length = idata.length;
break;
@@ -712,17 +712,17 @@
int pixel=0,length=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
length = bdata.length;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
length = sdata.length;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
length = idata.length;
break;
@@ -779,17 +779,17 @@
int pixel=0,length=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
length = bdata.length;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
length = sdata.length;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
length = idata.length;
break;
@@ -842,17 +842,17 @@
int pixel=0,length=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
length = bdata.length;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
length = sdata.length;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
length = idata.length;
break;
@@ -1333,7 +1333,7 @@
* @since 1.4
*/
public int getDataElement(float[] normComponents, int normOffset) {
- int components[] = getUnnormalizedComponents(normComponents,
+ int[] components = getUnnormalizedComponents(normComponents,
normOffset, null, 0);
return getDataElement(components, 0);
}
@@ -1381,7 +1381,7 @@
*/
public Object getDataElements(float[] normComponents, int normOffset,
Object obj) {
- int components[] = getUnnormalizedComponents(normComponents,
+ int[] components = getUnnormalizedComponents(normComponents,
normOffset, null, 0);
return getDataElements(components, 0, obj);
}
@@ -1442,7 +1442,7 @@
public float[] getNormalizedComponents(Object pixel,
float[] normComponents,
int normOffset) {
- int components[] = getComponents(pixel, null, 0);
+ int[] components = getComponents(pixel, null, 0);
return getNormalizedComponents(components, 0,
normComponents, normOffset);
}
--- a/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -802,7 +802,7 @@
// Note: we do no clamping of the pixel data here - we
// assume that the data is scaled properly
case DataBuffer.TYPE_SHORT: {
- short sdata[] = (short[]) inData;
+ short[] sdata = (short[]) inData;
float scalefactor = (float) ((1 << precision) - 1);
if (needAlpha) {
short s = sdata[numColorComponents];
@@ -817,7 +817,7 @@
}
}
case DataBuffer.TYPE_FLOAT: {
- float fdata[] = (float[]) inData;
+ float[] fdata = (float[]) inData;
float scalefactor = (float) ((1 << precision) - 1);
if (needAlpha) {
float f = fdata[numColorComponents];
@@ -831,7 +831,7 @@
}
}
case DataBuffer.TYPE_DOUBLE: {
- double ddata[] = (double[]) inData;
+ double[] ddata = (double[]) inData;
double scalefactor = (double) ((1 << precision) - 1);
if (needAlpha) {
double d = ddata[numColorComponents];
@@ -845,7 +845,7 @@
}
}
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
comp = bdata[idx] & mask;
precision = 8;
if (needAlpha) {
@@ -853,14 +853,14 @@
}
break;
case DataBuffer.TYPE_USHORT:
- short usdata[] = (short[])inData;
+ short[] usdata = (short[])inData;
comp = usdata[idx] & mask;
if (needAlpha) {
alp = usdata[numColorComponents] & mask;
}
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
comp = idata[idx];
if (needAlpha) {
alp = idata[numColorComponents];
@@ -1054,27 +1054,27 @@
switch (transferType) {
case DataBuffer.TYPE_SHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
alpha = (int) ((sdata[aIdx] / 32767.0f) * 255.0f + 0.5f);
return alpha;
case DataBuffer.TYPE_FLOAT:
- float fdata[] = (float[])inData;
+ float[] fdata = (float[])inData;
alpha = (int) (fdata[aIdx] * 255.0f + 0.5f);
return alpha;
case DataBuffer.TYPE_DOUBLE:
- double ddata[] = (double[])inData;
+ double[] ddata = (double[])inData;
alpha = (int) (ddata[aIdx] * 255.0 + 0.5);
return alpha;
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
alpha = bdata[aIdx] & mask;
break;
case DataBuffer.TYPE_USHORT:
- short usdata[] = (short[])inData;
+ short[] usdata = (short[])inData;
alpha = usdata[aIdx] & mask;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
alpha = idata[aIdx];
break;
default:
@@ -1201,7 +1201,7 @@
switch(transferType) {
case DataBuffer.TYPE_SHORT:
{
- short sdata[];
+ short[] sdata;
if (pixel == null) {
sdata = new short[numComponents];
} else {
@@ -1264,7 +1264,7 @@
sdata[0] = (short) (gray * factor + 0.5f);
} else {
factor = 1.0f / 255.0f;
- float norm[] = new float[3];
+ float[] norm = new float[3];
norm[0] = red * factor;
norm[1] = grn * factor;
norm[2] = blu * factor;
@@ -1300,7 +1300,7 @@
}
case DataBuffer.TYPE_FLOAT:
{
- float fdata[];
+ float[] fdata;
if (pixel == null) {
fdata = new float[numComponents];
} else {
@@ -1357,7 +1357,7 @@
}
}
} else {
- float norm[] = new float[3];
+ float[] norm = new float[3];
factor = 1.0f / 255.0f;
norm[0] = red * factor;
norm[1] = grn * factor;
@@ -1381,7 +1381,7 @@
}
case DataBuffer.TYPE_DOUBLE:
{
- double ddata[];
+ double[] ddata;
if (pixel == null) {
ddata = new double[numComponents];
} else {
@@ -1439,7 +1439,7 @@
}
} else {
float factor = 1.0f / 255.0f;
- float norm[] = new float[3];
+ float[] norm = new float[3];
norm[0] = red * factor;
norm[1] = grn * factor;
norm[2] = blu * factor;
@@ -1466,7 +1466,7 @@
// Handle BYTE, USHORT, & INT here
//REMIND: maybe more efficient not to use int array for
//DataBuffer.TYPE_USHORT and DataBuffer.TYPE_INT
- int intpixel[];
+ int[] intpixel;
if (transferType == DataBuffer.TYPE_INT &&
pixel != null) {
intpixel = (int[])pixel;
@@ -1615,7 +1615,7 @@
switch (transferType) {
case DataBuffer.TYPE_BYTE: {
- byte bdata[];
+ byte[] bdata;
if (pixel == null) {
bdata = new byte[numComponents];
} else {
@@ -1627,7 +1627,7 @@
return bdata;
}
case DataBuffer.TYPE_USHORT:{
- short sdata[];
+ short[] sdata;
if (pixel == null) {
sdata = new short[numComponents];
} else {
@@ -1741,7 +1741,7 @@
* enough to hold a pixel value for this ColorModel.
*/
public int[] getComponents(Object pixel, int[] components, int offset) {
- int intpixel[];
+ int[] intpixel;
if (needScaleInit) {
initScale();
}
@@ -2057,7 +2057,7 @@
switch (transferType) {
case DataBuffer.TYPE_BYTE:
{
- byte bpixel[] = (byte[]) pixel;
+ byte[] bpixel = (byte[]) pixel;
return bpixel[0] & 0xff;
}
case DataBuffer.TYPE_USHORT:
@@ -2468,8 +2468,8 @@
if (isAlphaPremultiplied) {
switch (transferType) {
case DataBuffer.TYPE_BYTE: {
- byte pixel[] = null;
- byte zpixel[] = null;
+ byte[] pixel = null;
+ byte[] zpixel = null;
float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2495,8 +2495,8 @@
}
break;
case DataBuffer.TYPE_USHORT: {
- short pixel[] = null;
- short zpixel[] = null;
+ short[] pixel = null;
+ short[] zpixel = null;
float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2523,8 +2523,8 @@
}
break;
case DataBuffer.TYPE_INT: {
- int pixel[] = null;
- int zpixel[] = null;
+ int[] pixel = null;
+ int[] zpixel = null;
float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2550,8 +2550,8 @@
}
break;
case DataBuffer.TYPE_SHORT: {
- short pixel[] = null;
- short zpixel[] = null;
+ short[] pixel = null;
+ short[] zpixel = null;
float alphaScale = 1.0f / 32767.0f;
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2577,8 +2577,8 @@
}
break;
case DataBuffer.TYPE_FLOAT: {
- float pixel[] = null;
- float zpixel[] = null;
+ float[] pixel = null;
+ float[] zpixel = null;
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
for (int x = 0; x < w; x++, rX++) {
@@ -2602,8 +2602,8 @@
}
break;
case DataBuffer.TYPE_DOUBLE: {
- double pixel[] = null;
- double zpixel[] = null;
+ double[] pixel = null;
+ double[] zpixel = null;
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
for (int x = 0; x < w; x++, rX++) {
@@ -2635,7 +2635,7 @@
// We are premultiplied and want to divide it out
switch (transferType) {
case DataBuffer.TYPE_BYTE: {
- byte pixel[] = null;
+ byte[] pixel = null;
float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2656,7 +2656,7 @@
}
break;
case DataBuffer.TYPE_USHORT: {
- short pixel[] = null;
+ short[] pixel = null;
float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2677,7 +2677,7 @@
}
break;
case DataBuffer.TYPE_INT: {
- int pixel[] = null;
+ int[] pixel = null;
float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2698,7 +2698,7 @@
}
break;
case DataBuffer.TYPE_SHORT: {
- short pixel[] = null;
+ short[] pixel = null;
float alphaScale = 1.0f / 32767.0f;
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
@@ -2719,7 +2719,7 @@
}
break;
case DataBuffer.TYPE_FLOAT: {
- float pixel[] = null;
+ float[] pixel = null;
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
for (int x = 0; x < w; x++, rX++) {
@@ -2738,7 +2738,7 @@
}
break;
case DataBuffer.TYPE_DOUBLE: {
- double pixel[] = null;
+ double[] pixel = null;
for (int y = 0; y < h; y++, rY++) {
rX = rminX;
for (int x = 0; x < w; x++, rX++) {
--- a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -76,7 +76,7 @@
public class ComponentSampleModel extends SampleModel
{
/** Offsets for all bands in data array elements. */
- protected int bandOffsets[];
+ protected int[] bandOffsets;
/** Index for each bank storing a band of image data. */
protected int[] bankIndices;
@@ -136,7 +136,7 @@
int w, int h,
int pixelStride,
int scanlineStride,
- int bandOffsets[]) {
+ int[] bandOffsets) {
super(dataType, w, h, bandOffsets.length);
this.dataType = dataType;
this.pixelStride = pixelStride;
@@ -199,8 +199,8 @@
int w, int h,
int pixelStride,
int scanlineStride,
- int bankIndices[],
- int bandOffsets[]) {
+ int[] bankIndices,
+ int[] bandOffsets) {
super(dataType, w, h, bandOffsets.length);
this.dataType = dataType;
this.pixelStride = pixelStride;
@@ -292,9 +292,9 @@
/**
* Preserves band ordering with new step factor...
*/
- int []orderBands(int orig[], int step) {
- int map[] = new int[orig.length];
- int ret[] = new int[orig.length];
+ int []orderBands(int[] orig, int step) {
+ int[] map = new int[orig.length];
+ int[] ret = new int[orig.length];
for (int i=0; i<map.length; i++) map[i] = i;
@@ -334,7 +334,7 @@
maxBandOff -= minBandOff;
int bands = bandOffsets.length;
- int bandOff[];
+ int[] bandOff;
int pStride = Math.abs(pixelStride);
int lStride = Math.abs(scanlineStride);
int bStride = Math.abs(maxBandOff);
@@ -402,13 +402,13 @@
* @return a {@code ComponentSampleModel} created with a subset
* of bands from this {@code ComponentSampleModel}.
*/
- public SampleModel createSubsetSampleModel(int bands[]) {
+ public SampleModel createSubsetSampleModel(int[] bands) {
if (bands.length > bankIndices.length)
throw new RasterFormatException("There are only " +
bankIndices.length +
" bands");
- int newBankIndices[] = new int[bands.length];
- int newBandOffsets[] = new int[bands.length];
+ int[] newBankIndices = new int[bands.length];
+ int[] newBandOffsets = new int[bands.length];
for (int i=0; i<bands.length; i++) {
newBankIndices[i] = bankIndices[bands[i]];
@@ -499,7 +499,7 @@
* represents a band.
*/
public final int[] getSampleSize() {
- int sampleSize[] = new int [numBands];
+ int[] sampleSize = new int [numBands];
int sizeInBits = getSampleSize(0);
for (int i=0; i<numBands; i++)
@@ -728,12 +728,12 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if iArray is too small to hold the output.
*/
- public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+ public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int pixels[];
+ int[] pixels;
if (iArray != null) {
pixels = iArray;
} else {
@@ -762,7 +762,7 @@
* @see #setPixels(int, int, int, int, int[], DataBuffer)
*/
public int[] getPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int x1 = x + w;
int y1 = y + h;
@@ -772,7 +772,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int pixels[];
+ int[] pixels;
if (iArray != null) {
pixels = iArray;
} else {
@@ -886,13 +886,13 @@
* @see #setSamples(int, int, int, int, int, int[], DataBuffer)
*/
public int[] getSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
// Bounds check for 'b' will be performed automatically
if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int samples[];
+ int[] samples;
if (iArray != null) {
samples = iArray;
} else {
@@ -1027,7 +1027,7 @@
* @param data The DataBuffer containing the image data
* @see #getPixel(int, int, int[], DataBuffer)
*/
- public void setPixel(int x, int y, int iArray[], DataBuffer data) {
+ public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
@@ -1053,7 +1053,7 @@
* @see #getPixels(int, int, int, int, int[], DataBuffer)
*/
public void setPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int x1 = x + w;
int y1 = y + h;
@@ -1168,7 +1168,7 @@
* @see #getSamples(int, int, int, int, int, int[], DataBuffer)
*/
public void setSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
// Bounds check for 'b' will be performed automatically
if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
throw new ArrayIndexOutOfBoundsException
--- a/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -114,7 +114,7 @@
* with the filtering operation.
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, byte pixels[], int off,
+ ColorModel model, byte[] pixels, int off,
int scansize) {
int x1 = x;
if (x1 < cropX) {
@@ -154,7 +154,7 @@
* with the filtering operation.
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, int pixels[], int off,
+ ColorModel model, int[] pixels, int off,
int scansize) {
int x1 = x;
if (x1 < cropX) {
--- a/src/java.desktop/share/classes/java/awt/image/DataBuffer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DataBuffer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -103,13 +103,13 @@
protected int size;
/** Offsets into all banks. */
- protected int offsets[];
+ protected int[] offsets;
/* The current StateTrackable state. */
StateTrackableDelegate theTrackable;
/** Size of the data types indexed by DataType tags defined above. */
- private static final int dataTypeSize[] = {8,16,16,32,32,64};
+ private static final int[] dataTypeSize = {8,16,16,32,32,64};
/** Returns the size (in bits) of the data type, given a datatype tag.
* @param type the value of one of the defined datatype tags
@@ -246,7 +246,7 @@
* @throws ArrayIndexOutOfBoundsException if {@code numBanks}
* does not equal the length of {@code offsets}
*/
- protected DataBuffer(int dataType, int size, int numBanks, int offsets[]) {
+ protected DataBuffer(int dataType, int size, int numBanks, int[] offsets) {
this(UNTRACKABLE, dataType, size, numBanks, offsets);
}
@@ -268,7 +268,7 @@
* @since 1.7
*/
DataBuffer(State initialState,
- int dataType, int size, int numBanks, int offsets[])
+ int dataType, int size, int numBanks, int[] offsets)
{
if (numBanks != offsets.length) {
throw new ArrayIndexOutOfBoundsException("Number of banks" +
@@ -498,15 +498,15 @@
} else if (obj == null) {
return null;
} else if (obj instanceof short[]) {
- short sdata[] = (short[])obj;
- int idata[] = new int[sdata.length];
+ short[] sdata = (short[])obj;
+ int[] idata = new int[sdata.length];
for (int i = 0; i < sdata.length; i++) {
idata[i] = (int)sdata[i] & 0xffff;
}
return idata;
} else if (obj instanceof byte[]) {
- byte bdata[] = (byte[])obj;
- int idata[] = new int[bdata.length];
+ byte[] bdata = (byte[])obj;
+ int[] idata = new int[bdata.length];
for (int i = 0; i < bdata.length; i++) {
idata[i] = 0xff & (int)bdata[i];
}
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -60,10 +60,10 @@
public final class DataBufferByte extends DataBuffer
{
/** The default data bank. */
- byte data[];
+ byte[] data;
/** All data banks */
- byte bankdata[][];
+ byte[][] bankdata;
/**
* Constructs a byte-based {@code DataBuffer} with a single bank and the
@@ -109,7 +109,7 @@
* @param dataArray The byte array for the {@code DataBuffer}.
* @param size The size of the {@code DataBuffer} bank.
*/
- public DataBufferByte(byte dataArray[], int size) {
+ public DataBufferByte(byte[] dataArray, int size) {
super(UNTRACKABLE, TYPE_BYTE, size);
data = dataArray;
bankdata = new byte[1][];
@@ -133,7 +133,7 @@
* @param offset The offset into the {@code dataArray}. {@code dataArray}
* must have at least {@code offset} + {@code size} elements.
*/
- public DataBufferByte(byte dataArray[], int size, int offset){
+ public DataBufferByte(byte[] dataArray, int size, int offset){
super(UNTRACKABLE, TYPE_BYTE, size, 1, offset);
data = dataArray;
bankdata = new byte[1][];
@@ -154,7 +154,7 @@
* @param dataArray The byte arrays for the {@code DataBuffer}.
* @param size The size of the banks in the {@code DataBuffer}.
*/
- public DataBufferByte(byte dataArray[][], int size) {
+ public DataBufferByte(byte[][] dataArray, int size) {
super(UNTRACKABLE, TYPE_BYTE, size, dataArray.length);
bankdata = dataArray.clone();
data = bankdata[0];
@@ -179,7 +179,7 @@
* @param size The size of the banks in the {@code DataBuffer}.
* @param offsets The offsets into each array.
*/
- public DataBufferByte(byte dataArray[][], int size, int offsets[]) {
+ public DataBufferByte(byte[][] dataArray, int size, int[] offsets) {
super(UNTRACKABLE, TYPE_BYTE, size, dataArray.length, offsets);
bankdata = dataArray.clone();
data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -52,10 +52,10 @@
public final class DataBufferDouble extends DataBuffer {
/** The array of data banks. */
- double bankdata[][];
+ double[][] bankdata;
/** A reference to the default data bank. */
- double data[];
+ double[] data;
/**
* Constructs a {@code double}-based {@code DataBuffer}
@@ -104,7 +104,7 @@
* first and only bank of this {@code DataBuffer}.
* @param size The number of elements of the array to be used.
*/
- public DataBufferDouble(double dataArray[], int size) {
+ public DataBufferDouble(double[] dataArray, int size) {
super(UNTRACKABLE, TYPE_DOUBLE, size);
data = dataArray;
bankdata = new double[1][];
@@ -129,7 +129,7 @@
* @param offset The offset of the first element of the array
* that will be used.
*/
- public DataBufferDouble(double dataArray[], int size, int offset) {
+ public DataBufferDouble(double[] dataArray, int size, int offset) {
super(UNTRACKABLE, TYPE_DOUBLE, size, 1, offset);
data = dataArray;
bankdata = new double[1][];
@@ -152,7 +152,7 @@
* used as the banks of this {@code DataBuffer}.
* @param size The number of elements of each array to be used.
*/
- public DataBufferDouble(double dataArray[][], int size) {
+ public DataBufferDouble(double[][] dataArray, int size) {
super(UNTRACKABLE, TYPE_DOUBLE, size, dataArray.length);
bankdata = dataArray.clone();
data = bankdata[0];
@@ -176,7 +176,7 @@
* @param size The number of elements of each array to be used.
* @param offsets An array of integer offsets, one for each bank.
*/
- public DataBufferDouble(double dataArray[][], int size, int offsets[]) {
+ public DataBufferDouble(double[][] dataArray, int size, int[] offsets) {
super(UNTRACKABLE, TYPE_DOUBLE, size, dataArray.length, offsets);
bankdata = dataArray.clone();
data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -52,10 +52,10 @@
public final class DataBufferFloat extends DataBuffer {
/** The array of data banks. */
- float bankdata[][];
+ float[][] bankdata;
/** A reference to the default data bank. */
- float data[];
+ float[] data;
/**
* Constructs a {@code float}-based {@code DataBuffer}
@@ -105,7 +105,7 @@
* first and only bank of this {@code DataBuffer}.
* @param size The number of elements of the array to be used.
*/
- public DataBufferFloat(float dataArray[], int size) {
+ public DataBufferFloat(float[] dataArray, int size) {
super(UNTRACKABLE, TYPE_FLOAT, size);
data = dataArray;
bankdata = new float[1][];
@@ -131,7 +131,7 @@
* @param offset The offset of the first element of the array
* that will be used.
*/
- public DataBufferFloat(float dataArray[], int size, int offset) {
+ public DataBufferFloat(float[] dataArray, int size, int offset) {
super(UNTRACKABLE, TYPE_FLOAT, size, 1, offset);
data = dataArray;
bankdata = new float[1][];
@@ -154,7 +154,7 @@
* used as the banks of this {@code DataBuffer}.
* @param size The number of elements of each array to be used.
*/
- public DataBufferFloat(float dataArray[][], int size) {
+ public DataBufferFloat(float[][] dataArray, int size) {
super(UNTRACKABLE, TYPE_FLOAT, size, dataArray.length);
bankdata = dataArray.clone();
data = bankdata[0];
@@ -178,7 +178,7 @@
* @param size The number of elements of each array to be used.
* @param offsets An array of integer offsets, one for each bank.
*/
- public DataBufferFloat(float dataArray[][], int size, int offsets[]) {
+ public DataBufferFloat(float[][] dataArray, int size, int[] offsets) {
super(UNTRACKABLE, TYPE_FLOAT, size,dataArray.length, offsets);
bankdata = dataArray.clone();
data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -59,10 +59,10 @@
public final class DataBufferInt extends DataBuffer
{
/** The default data bank. */
- int data[];
+ int[] data;
/** All data banks */
- int bankdata[][];
+ int[][] bankdata;
/**
* Constructs an integer-based {@code DataBuffer} with a single bank
@@ -108,7 +108,7 @@
* @param dataArray The integer array for the {@code DataBuffer}.
* @param size The size of the {@code DataBuffer} bank.
*/
- public DataBufferInt(int dataArray[], int size) {
+ public DataBufferInt(int[] dataArray, int size) {
super(UNTRACKABLE, TYPE_INT, size);
data = dataArray;
bankdata = new int[1][];
@@ -131,7 +131,7 @@
* @param size The size of the {@code DataBuffer} bank.
* @param offset The offset into the {@code dataArray}.
*/
- public DataBufferInt(int dataArray[], int size, int offset) {
+ public DataBufferInt(int[] dataArray, int size, int offset) {
super(UNTRACKABLE, TYPE_INT, size, 1, offset);
data = dataArray;
bankdata = new int[1][];
@@ -152,7 +152,7 @@
* @param dataArray The integer arrays for the {@code DataBuffer}.
* @param size The size of the banks in the {@code DataBuffer}.
*/
- public DataBufferInt(int dataArray[][], int size) {
+ public DataBufferInt(int[][] dataArray, int size) {
super(UNTRACKABLE, TYPE_INT, size, dataArray.length);
bankdata = dataArray.clone();
data = bankdata[0];
@@ -177,7 +177,7 @@
* @param size The size of the banks in the {@code DataBuffer}.
* @param offsets The offsets into each array.
*/
- public DataBufferInt(int dataArray[][], int size, int offsets[]) {
+ public DataBufferInt(int[][] dataArray, int size, int[] offsets) {
super(UNTRACKABLE, TYPE_INT, size, dataArray.length, offsets);
bankdata = dataArray.clone();
data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -58,10 +58,10 @@
public final class DataBufferShort extends DataBuffer
{
/** The default data bank. */
- short data[];
+ short[] data;
/** All data banks */
- short bankdata[][];
+ short[][] bankdata;
/**
* Constructs a short-based {@code DataBuffer} with a single bank and the
@@ -107,7 +107,7 @@
* @param dataArray The short array for the {@code DataBuffer}.
* @param size The size of the {@code DataBuffer} bank.
*/
- public DataBufferShort(short dataArray[], int size) {
+ public DataBufferShort(short[] dataArray, int size) {
super(UNTRACKABLE, TYPE_SHORT, size);
data = dataArray;
bankdata = new short[1][];
@@ -130,7 +130,7 @@
* @param size The size of the {@code DataBuffer} bank.
* @param offset The offset into the {@code dataArray}.
*/
- public DataBufferShort(short dataArray[], int size, int offset) {
+ public DataBufferShort(short[] dataArray, int size, int offset) {
super(UNTRACKABLE, TYPE_SHORT, size, 1, offset);
data = dataArray;
bankdata = new short[1][];
@@ -151,7 +151,7 @@
* @param dataArray The short arrays for the {@code DataBuffer}.
* @param size The size of the banks in the {@code DataBuffer}.
*/
- public DataBufferShort(short dataArray[][], int size) {
+ public DataBufferShort(short[][] dataArray, int size) {
super(UNTRACKABLE, TYPE_SHORT, size, dataArray.length);
bankdata = dataArray.clone();
data = bankdata[0];
@@ -176,7 +176,7 @@
* @param size The size of the banks in the {@code DataBuffer}.
* @param offsets The offsets into each array.
*/
- public DataBufferShort(short dataArray[][], int size, int offsets[]) {
+ public DataBufferShort(short[][] dataArray, int size, int[] offsets) {
super(UNTRACKABLE, TYPE_SHORT, size, dataArray.length, offsets);
bankdata = dataArray.clone();
data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -60,10 +60,10 @@
public final class DataBufferUShort extends DataBuffer
{
/** The default data bank. */
- short data[];
+ short[] data;
/** All data banks */
- short bankdata[][];
+ short[][] bankdata;
/**
* Constructs an unsigned-short based {@code DataBuffer} with a single bank and the
@@ -109,7 +109,7 @@
* @param dataArray The unsigned-short array for the {@code DataBuffer}.
* @param size The size of the {@code DataBuffer} bank.
*/
- public DataBufferUShort(short dataArray[], int size) {
+ public DataBufferUShort(short[] dataArray, int size) {
super(UNTRACKABLE, TYPE_USHORT, size);
if (dataArray == null) {
throw new NullPointerException("dataArray is null");
@@ -135,7 +135,7 @@
* @param size The size of the {@code DataBuffer} bank.
* @param offset The offset into the {@code dataArray}.
*/
- public DataBufferUShort(short dataArray[], int size, int offset) {
+ public DataBufferUShort(short[] dataArray, int size, int offset) {
super(UNTRACKABLE, TYPE_USHORT, size, 1, offset);
if (dataArray == null) {
throw new NullPointerException("dataArray is null");
@@ -163,7 +163,7 @@
* @param dataArray The unsigned-short arrays for the {@code DataBuffer}.
* @param size The size of the banks in the {@code DataBuffer}.
*/
- public DataBufferUShort(short dataArray[][], int size) {
+ public DataBufferUShort(short[][] dataArray, int size) {
super(UNTRACKABLE, TYPE_USHORT, size, dataArray.length);
if (dataArray == null) {
throw new NullPointerException("dataArray is null");
@@ -197,7 +197,7 @@
* @param size The size of the banks in the {@code DataBuffer}.
* @param offsets The offsets into each array.
*/
- public DataBufferUShort(short dataArray[][], int size, int offsets[]) {
+ public DataBufferUShort(short[][] dataArray, int size, int[] offsets) {
super(UNTRACKABLE, TYPE_USHORT, size, dataArray.length, offsets);
if (dataArray == null) {
throw new NullPointerException("dataArray is null");
--- a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -311,8 +311,8 @@
* components as float values between 0.0 and 1.0.
*/
private float[] getDefaultRGBComponents(int pixel) {
- int components[] = getComponents(pixel, null, 0);
- float norm[] = getNormalizedComponents(components, 0, null, 0);
+ int[] components = getComponents(pixel, null, 0);
+ float[] norm = getNormalizedComponents(components, 0, null, 0);
// Note that getNormalizedComponents returns non-premultiplied values
return colorSpace.toRGB(norm);
}
@@ -371,7 +371,7 @@
} else if (is_LinearRGB) {
return getsRGBComponentFromLinearRGB(pixel, 0);
}
- float rgb[] = getDefaultRGBComponents(pixel);
+ float[] rgb = getDefaultRGBComponents(pixel);
return (int) (rgb[0] * 255.0f + 0.5f);
}
@@ -394,7 +394,7 @@
} else if (is_LinearRGB) {
return getsRGBComponentFromLinearRGB(pixel, 1);
}
- float rgb[] = getDefaultRGBComponents(pixel);
+ float[] rgb = getDefaultRGBComponents(pixel);
return (int) (rgb[1] * 255.0f + 0.5f);
}
@@ -417,7 +417,7 @@
} else if (is_LinearRGB) {
return getsRGBComponentFromLinearRGB(pixel, 2);
}
- float rgb[] = getDefaultRGBComponents(pixel);
+ float[] rgb = getDefaultRGBComponents(pixel);
return (int) (rgb[2] * 255.0f + 0.5f);
}
@@ -457,7 +457,7 @@
| (getGreen(pixel) << 8)
| (getBlue(pixel) << 0);
}
- float rgb[] = getDefaultRGBComponents(pixel);
+ float[] rgb = getDefaultRGBComponents(pixel);
return (getAlpha(pixel) << 24)
| (((int) (rgb[0] * 255.0f + 0.5f)) << 16)
| (((int) (rgb[1] * 255.0f + 0.5f)) << 8)
@@ -499,15 +499,15 @@
int pixel=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
break;
default:
@@ -552,15 +552,15 @@
int pixel=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
break;
default:
@@ -605,15 +605,15 @@
int pixel=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
break;
default:
@@ -655,15 +655,15 @@
int pixel=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
break;
default:
@@ -703,15 +703,15 @@
int pixel=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0] & 0xffff;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
break;
default:
@@ -758,7 +758,7 @@
public Object getDataElements(int rgb, Object pixel) {
//REMIND: maybe more efficient not to use int array for
//DataBuffer.TYPE_USHORT and DataBuffer.TYPE_INT
- int intpixel[] = null;
+ int[] intpixel = null;
if (transferType == DataBuffer.TYPE_INT &&
pixel != null) {
intpixel = (int[])pixel;
@@ -876,7 +876,7 @@
switch (transferType) {
case DataBuffer.TYPE_BYTE: {
- byte bdata[];
+ byte[] bdata;
if (pixel == null) {
bdata = new byte[1];
} else {
@@ -886,7 +886,7 @@
return bdata;
}
case DataBuffer.TYPE_USHORT:{
- short sdata[];
+ short[] sdata;
if (pixel == null) {
sdata = new short[1];
} else {
@@ -979,15 +979,15 @@
int intpixel=0;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])pixel;
+ byte[] bdata = (byte[])pixel;
intpixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])pixel;
+ short[] sdata = (short[])pixel;
intpixel = sdata[0] & 0xffff;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])pixel;
+ int[] idata = (int[])pixel;
intpixel = idata[0];
break;
default:
@@ -1118,29 +1118,29 @@
switch (transferType) {
case DataBuffer.TYPE_BYTE:
if (obj instanceof byte[]) {
- byte bdata[] = (byte[])obj;
+ byte[] bdata = (byte[])obj;
bdata[0] = (byte)(pixel&0xff);
return bdata;
} else {
- byte bdata[] = {(byte)(pixel&0xff)};
+ byte[] bdata = {(byte)(pixel&0xff)};
return bdata;
}
case DataBuffer.TYPE_USHORT:
if (obj instanceof short[]) {
- short sdata[] = (short[])obj;
+ short[] sdata = (short[])obj;
sdata[0] = (short)(pixel&0xffff);
return sdata;
} else {
- short sdata[] = {(short)(pixel&0xffff)};
+ short[] sdata = {(short)(pixel&0xffff)};
return sdata;
}
case DataBuffer.TYPE_INT:
if (obj instanceof int[]) {
- int idata[] = (int[])obj;
+ int[] idata = (int[])obj;
idata[0] = pixel;
return idata;
} else {
- int idata[] = {pixel};
+ int[] idata = {pixel};
return idata;
}
default:
@@ -1190,8 +1190,8 @@
int rminX = raster.getMinX();
int rY = raster.getMinY();
int rX;
- int pixel[] = null;
- int zpixel[] = null;
+ int[] pixel = null;
+ int[] zpixel = null;
if (isAlphaPremultiplied) {
// Must mean that we are currently not premultiplied so
--- a/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -158,7 +158,7 @@
* @see ColorModel
*/
void setPixels(int x, int y, int w, int h,
- ColorModel model, byte pixels[], int off, int scansize);
+ ColorModel model, byte[] pixels, int off, int scansize);
/**
* The pixels of the image are delivered using one or more calls
@@ -184,7 +184,7 @@
* @see ColorModel
*/
void setPixels(int x, int y, int w, int h,
- ColorModel model, int pixels[], int off, int scansize);
+ ColorModel model, int[] pixels, int off, int scansize);
/**
* The imageComplete method is called when the ImageProducer is
--- a/src/java.desktop/share/classes/java/awt/image/ImageFilter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ImageFilter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -157,7 +157,7 @@
* @see ImageConsumer#setPixels
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, byte pixels[], int off,
+ ColorModel model, byte[] pixels, int off,
int scansize) {
consumer.setPixels(x, y, w, h, model, pixels, off, scansize);
}
@@ -174,7 +174,7 @@
* @see ImageConsumer#setPixels
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, int pixels[], int off,
+ ColorModel model, int[] pixels, int off,
int scansize) {
consumer.setPixels(x, y, w, h, model, pixels, off, scansize);
}
--- a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -124,7 +124,7 @@
*
*/
public class IndexColorModel extends ColorModel {
- private int rgb[];
+ private int[] rgb;
private int map_size;
private int pixel_mask;
private int transparent_index = -1;
@@ -166,7 +166,7 @@
* than 1
*/
public IndexColorModel(int bits, int size,
- byte r[], byte g[], byte b[]) {
+ byte[] r, byte[] g, byte[] b) {
super(bits, opaqueBits,
ColorSpace.getInstance(ColorSpace.CS_sRGB),
false, false, OPAQUE,
@@ -206,7 +206,7 @@
* 1
*/
public IndexColorModel(int bits, int size,
- byte r[], byte g[], byte b[], int trans) {
+ byte[] r, byte[] g, byte[] b, int trans) {
super(bits, opaqueBits,
ColorSpace.getInstance(ColorSpace.CS_sRGB),
false, false, OPAQUE,
@@ -245,7 +245,7 @@
* than 1
*/
public IndexColorModel(int bits, int size,
- byte r[], byte g[], byte b[], byte a[]) {
+ byte[] r, byte[] g, byte[] b, byte[] a) {
super (bits, alphaBits,
ColorSpace.getInstance(ColorSpace.CS_sRGB),
true, false, TRANSLUCENT,
@@ -284,7 +284,7 @@
* @throws IllegalArgumentException if {@code size} is less
* than 1
*/
- public IndexColorModel(int bits, int size, byte cmap[], int start,
+ public IndexColorModel(int bits, int size, byte[] cmap, int start,
boolean hasalpha) {
this(bits, size, cmap, start, hasalpha, -1);
if (bits < 1 || bits > 16) {
@@ -321,7 +321,7 @@
* @throws IllegalArgumentException if {@code size} is less than
* 1
*/
- public IndexColorModel(int bits, int size, byte cmap[], int start,
+ public IndexColorModel(int bits, int size, byte[] cmap, int start,
boolean hasalpha, int trans) {
// REMIND: This assumes the ordering: RGB[A]
super(bits, opaqueBits,
@@ -406,7 +406,7 @@
* {@code DataBuffer.TYPE_USHORT}
*/
public IndexColorModel(int bits, int size,
- int cmap[], int start,
+ int[] cmap, int start,
boolean hasalpha, int trans, int transferType) {
// REMIND: This assumes the ordering: RGB[A]
super(bits, opaqueBits,
@@ -472,7 +472,7 @@
*
* @since 1.3
*/
- public IndexColorModel(int bits, int size, int cmap[], int start,
+ public IndexColorModel(int bits, int size, int[] cmap, int start,
int transferType, BigInteger validBits) {
super (bits, alphaBits,
ColorSpace.getInstance(ColorSpace.CS_sRGB),
@@ -507,7 +507,7 @@
calculatePixelMask();
}
- private void setRGBs(int size, byte r[], byte g[], byte b[], byte a[]) {
+ private void setRGBs(int size, byte[] r, byte[] g, byte[] b, byte[] a) {
if (size < 1) {
throw new IllegalArgumentException("Map size ("+size+
") must be >= 1");
@@ -544,7 +544,7 @@
setTransparency(transparency);
}
- private void setRGBs(int size, int cmap[], int start, boolean hasalpha) {
+ private void setRGBs(int size, int[] cmap, int start, boolean hasalpha) {
map_size = size;
rgb = new int[calcRealMapSize(pixel_bits, size)];
int j = start;
@@ -663,7 +663,7 @@
* @param r the specified array into which the elements of the
* array of red color components are copied
*/
- public final void getReds(byte r[]) {
+ public final void getReds(byte[] r) {
for (int i = 0; i < map_size; i++) {
r[i] = (byte) (rgb[i] >> 16);
}
@@ -676,7 +676,7 @@
* @param g the specified array into which the elements of the
* array of green color components are copied
*/
- public final void getGreens(byte g[]) {
+ public final void getGreens(byte[] g) {
for (int i = 0; i < map_size; i++) {
g[i] = (byte) (rgb[i] >> 8);
}
@@ -689,7 +689,7 @@
* @param b the specified array into which the elements of the
* array of blue color components are copied
*/
- public final void getBlues(byte b[]) {
+ public final void getBlues(byte[] b) {
for (int i = 0; i < map_size; i++) {
b[i] = (byte) rgb[i];
}
@@ -702,7 +702,7 @@
* @param a the specified array into which the elements of the
* array of alpha components are copied
*/
- public final void getAlphas(byte a[]) {
+ public final void getAlphas(byte[] a) {
for (int i = 0; i < map_size; i++) {
a[i] = (byte) (rgb[i] >> 24);
}
@@ -719,7 +719,7 @@
* values from this array of color and alpha components
* are copied.
*/
- public final void getRGBs(int rgb[]) {
+ public final void getRGBs(int[] rgb) {
System.arraycopy(this.rgb, 0, rgb, 0, map_size);
}
@@ -841,7 +841,7 @@
}
private static final int CACHESIZE = 40;
- private int lookupcache[] = new int[CACHESIZE];
+ private int[] lookupcache = new int[CACHESIZE];
/**
* Returns a data element array representation of a pixel in this
@@ -945,7 +945,7 @@
// exact match.
int smallestError = Integer.MAX_VALUE;
- int lut[] = this.rgb;
+ int[] lut = this.rgb;
int lutrgb;
for (int i=0; i < map_size; i++) {
lutrgb = lut[i];
@@ -992,7 +992,7 @@
// Euclidean distance formula.
int smallestError = Integer.MAX_VALUE;
- int lut[] = this.rgb;
+ int[] lut = this.rgb;
for (int i=0; i < map_size; i++) {
int lutrgb = lut[i];
if (lutrgb == rgb) {
@@ -1162,15 +1162,15 @@
int intpixel;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])pixel;
+ byte[] bdata = (byte[])pixel;
intpixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])pixel;
+ short[] sdata = (short[])pixel;
intpixel = sdata[0] & 0xffff;
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])pixel;
+ int[] idata = (int[])pixel;
intpixel = idata[0];
break;
default:
@@ -1217,15 +1217,15 @@
int pixel;
switch (transferType) {
case DataBuffer.TYPE_BYTE:
- byte bdata[] = (byte[])inData;
+ byte[] bdata = (byte[])inData;
pixel = bdata[0] & 0xff;
break;
case DataBuffer.TYPE_USHORT:
- short sdata[] = (short[])inData;
+ short[] sdata = (short[])inData;
pixel = sdata[0];
break;
case DataBuffer.TYPE_INT:
- int idata[] = (int[])inData;
+ int[] idata = (int[])inData;
pixel = idata[0];
break;
default:
--- a/src/java.desktop/share/classes/java/awt/image/Kernel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/Kernel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -41,7 +41,7 @@
private int height;
private int xOrigin;
private int yOrigin;
- private float data[];
+ private float[] data;
private static native void initIDs();
static {
@@ -63,7 +63,7 @@
* is less than the product of {@code width} and
* {@code height}
*/
- public Kernel(int width, int height, float data[]) {
+ public Kernel(int width, int height, float[] data) {
this.width = width;
this.height = height;
this.xOrigin = (width-1)>>1;
--- a/src/java.desktop/share/classes/java/awt/image/LookupOp.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/LookupOp.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -255,7 +255,7 @@
int numBands = src.getNumBands();
int height = src.getHeight();
int width = src.getWidth();
- int srcPix[] = new int[numBands];
+ int[] srcPix = new int[numBands];
// Create a new destination Raster, if needed
--- a/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -223,7 +223,7 @@
* @see java.awt.Component#createImage
* @see ColorModel#getRGBdefault
*/
- public MemoryImageSource(int w, int h, int pix[], int off, int scan) {
+ public MemoryImageSource(int w, int h, int[] pix, int off, int scan) {
initialize(w, h, ColorModel.getRGBdefault(),
(Object) pix, off, scan, null);
}
@@ -243,7 +243,7 @@
* @see java.awt.Component#createImage
* @see ColorModel#getRGBdefault
*/
- public MemoryImageSource(int w, int h, int pix[], int off, int scan,
+ public MemoryImageSource(int w, int h, int[] pix, int off, int scan,
Hashtable<?,?> props)
{
initialize(w, h, ColorModel.getRGBdefault(),
--- a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -229,7 +229,7 @@
* @return the number of bits per sample.
*/
public int[] getSampleSize() {
- int sampleSize[] = {pixelBitStride};
+ int[] sampleSize = {pixelBitStride};
return sampleSize;
}
@@ -326,7 +326,7 @@
* @throws IllegalArgumentException if {@code w} or
* {@code h} is not greater than 0
*/
- public SampleModel createSubsetSampleModel(int bands[]) {
+ public SampleModel createSubsetSampleModel(int[] bands) {
if (bands != null) {
if (bands.length != 1)
throw new RasterFormatException("MultiPixelPackedSampleModel has "
@@ -530,12 +530,12 @@
* are not in bounds
* @see #setPixel(int, int, int[], DataBuffer)
*/
- public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+ public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int pixels[];
+ int[] pixels;
if (iArray != null) {
pixels = iArray;
} else {
--- a/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -429,7 +429,7 @@
private void convertToRGB() {
int size = dstW * dstH;
- int newpixels[] = new int[size];
+ int[] newpixels = new int[size];
if (bytePixels != null) {
for (int i = 0; i < size; i++) {
newpixels[i] = imageModel.getRGB(bytePixels[i] & 0xff);
@@ -470,7 +470,7 @@
*/
public void setPixels(int srcX, int srcY, int srcW, int srcH,
ColorModel model,
- byte pixels[], int srcOff, int srcScan) {
+ byte[] pixels, int srcOff, int srcScan) {
if (srcY < dstY) {
int diff = dstY - srcY;
if (diff >= srcH) {
@@ -557,7 +557,7 @@
*/
public void setPixels(int srcX, int srcY, int srcW, int srcH,
ColorModel model,
- int pixels[], int srcOff, int srcScan) {
+ int[] pixels, int srcOff, int srcScan) {
if (srcY < dstY) {
int diff = dstY - srcY;
if (diff >= srcH) {
--- a/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -83,7 +83,7 @@
int w, int h,
int pixelStride,
int scanlineStride,
- int bandOffsets[]) {
+ int[] bandOffsets) {
super(dataType, w, h, pixelStride, scanlineStride, bandOffsets);
int minBandOff=this.bandOffsets[0];
int maxBandOff=this.bandOffsets[0];
@@ -154,8 +154,8 @@
* an image with a subset of the bands of the original
* PixelInterleavedSampleModel/DataBuffer combination.
*/
- public SampleModel createSubsetSampleModel(int bands[]) {
- int newBandOffsets[] = new int[bands.length];
+ public SampleModel createSubsetSampleModel(int[] bands) {
+ int[] newBandOffsets = new int[bands.length];
for (int i=0; i<bands.length; i++) {
newBandOffsets[i] = bandOffsets[bands[i]];
}
--- a/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -146,10 +146,10 @@
*/
public IndexColorModel filterIndexColorModel(IndexColorModel icm) {
int mapsize = icm.getMapSize();
- byte r[] = new byte[mapsize];
- byte g[] = new byte[mapsize];
- byte b[] = new byte[mapsize];
- byte a[] = new byte[mapsize];
+ byte[] r = new byte[mapsize];
+ byte[] g = new byte[mapsize];
+ byte[] b = new byte[mapsize];
+ byte[] a = new byte[mapsize];
icm.getReds(r);
icm.getGreens(g);
icm.getBlues(b);
@@ -192,7 +192,7 @@
* @see #filterRGB
*/
public void filterRGBPixels(int x, int y, int w, int h,
- int pixels[], int off, int scansize) {
+ int[] pixels, int off, int scansize) {
int index = off;
for (int cy = 0; cy < h; cy++) {
for (int cx = 0; cx < w; cx++) {
@@ -222,12 +222,12 @@
* @see #filterRGBPixels
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, byte pixels[], int off,
+ ColorModel model, byte[] pixels, int off,
int scansize) {
if (model == origmodel) {
consumer.setPixels(x, y, w, h, newmodel, pixels, off, scansize);
} else {
- int filteredpixels[] = new int[w];
+ int[] filteredpixels = new int[w];
int index = off;
for (int cy = 0; cy < h; cy++) {
for (int cx = 0; cx < w; cx++) {
@@ -259,12 +259,12 @@
* @see #filterRGBPixels
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, int pixels[], int off,
+ ColorModel model, int[] pixels, int off,
int scansize) {
if (model == origmodel) {
consumer.setPixels(x, y, w, h, newmodel, pixels, off, scansize);
} else {
- int filteredpixels[] = new int[w];
+ int[] filteredpixels = new int[w];
int index = off;
for (int cy = 0; cy < h; cy++) {
for (int cx = 0; cx < w; cx++) {
--- a/src/java.desktop/share/classes/java/awt/image/Raster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/Raster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -254,7 +254,7 @@
int w, int h,
int scanlineStride,
int pixelStride,
- int bandOffsets[],
+ int[] bandOffsets,
Point location) {
DataBuffer d;
@@ -365,8 +365,8 @@
public static WritableRaster createBandedRaster(int dataType,
int w, int h,
int scanlineStride,
- int bankIndices[],
- int bandOffsets[],
+ int[] bankIndices,
+ int[] bandOffsets,
Point location) {
DataBuffer d;
int bands = bandOffsets.length;
@@ -450,7 +450,7 @@
*/
public static WritableRaster createPackedRaster(int dataType,
int w, int h,
- int bandMasks[],
+ int[] bandMasks,
Point location) {
DataBuffer d;
@@ -628,7 +628,7 @@
int w, int h,
int scanlineStride,
int pixelStride,
- int bandOffsets[],
+ int[] bandOffsets,
Point location)
{
if (dataBuffer == null) {
@@ -701,8 +701,8 @@
public static WritableRaster createBandedRaster(DataBuffer dataBuffer,
int w, int h,
int scanlineStride,
- int bankIndices[],
- int bandOffsets[],
+ int[] bankIndices,
+ int[] bandOffsets,
Point location)
{
if (dataBuffer == null) {
@@ -784,7 +784,7 @@
public static WritableRaster createPackedRaster(DataBuffer dataBuffer,
int w, int h,
int scanlineStride,
- int bandMasks[],
+ int[] bandMasks,
Point location)
{
if (dataBuffer == null) {
@@ -1397,7 +1397,7 @@
public Raster createChild(int parentX, int parentY,
int width, int height,
int childMinX, int childMinY,
- int bandList[]) {
+ int[] bandList) {
if (parentX < this.minX) {
throw new RasterFormatException("parentX lies outside raster");
}
@@ -1601,7 +1601,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if iArray is too small to hold the output.
*/
- public int[] getPixel(int x, int y, int iArray[]) {
+ public int[] getPixel(int x, int y, int[] iArray) {
return sampleModel.getPixel(x - sampleModelTranslateX,
y - sampleModelTranslateY,
iArray, dataBuffer);
@@ -1621,7 +1621,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if fArray is too small to hold the output.
*/
- public float[] getPixel(int x, int y, float fArray[]) {
+ public float[] getPixel(int x, int y, float[] fArray) {
return sampleModel.getPixel(x - sampleModelTranslateX,
y - sampleModelTranslateY,
fArray, dataBuffer);
@@ -1640,7 +1640,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if dArray is too small to hold the output.
*/
- public double[] getPixel(int x, int y, double dArray[]) {
+ public double[] getPixel(int x, int y, double[] dArray) {
return sampleModel.getPixel(x - sampleModelTranslateX,
y - sampleModelTranslateY,
dArray, dataBuffer);
@@ -1662,7 +1662,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if iArray is too small to hold the output.
*/
- public int[] getPixels(int x, int y, int w, int h, int iArray[]) {
+ public int[] getPixels(int x, int y, int w, int h, int[] iArray) {
return sampleModel.getPixels(x - sampleModelTranslateX,
y - sampleModelTranslateY, w, h,
iArray, dataBuffer);
@@ -1685,7 +1685,7 @@
* in bounds, or if fArray is too small to hold the output.
*/
public float[] getPixels(int x, int y, int w, int h,
- float fArray[]) {
+ float[] fArray) {
return sampleModel.getPixels(x - sampleModelTranslateX,
y - sampleModelTranslateY, w, h,
fArray, dataBuffer);
@@ -1708,7 +1708,7 @@
* in bounds, or if dArray is too small to hold the output.
*/
public double[] getPixels(int x, int y, int w, int h,
- double dArray[]) {
+ double[] dArray) {
return sampleModel.getPixels(x - sampleModelTranslateX,
y - sampleModelTranslateY,
w, h, dArray, dataBuffer);
@@ -1798,7 +1798,7 @@
* hold the output.
*/
public int[] getSamples(int x, int y, int w, int h, int b,
- int iArray[]) {
+ int[] iArray) {
return sampleModel.getSamples(x - sampleModelTranslateX,
y - sampleModelTranslateY,
w, h, b, iArray,
@@ -1825,7 +1825,7 @@
* hold the output.
*/
public float[] getSamples(int x, int y, int w, int h, int b,
- float fArray[]) {
+ float[] fArray) {
return sampleModel.getSamples(x - sampleModelTranslateX,
y - sampleModelTranslateY,
w, h, b, fArray, dataBuffer);
@@ -1851,7 +1851,7 @@
* hold the output.
*/
public double[] getSamples(int x, int y, int w, int h, int b,
- double dArray[]) {
+ double[] dArray) {
return sampleModel.getSamples(x - sampleModelTranslateX,
y - sampleModelTranslateY,
w, h, b, dArray, dataBuffer);
--- a/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -74,13 +74,13 @@
* An {@code int} array containing information about a
* row of pixels.
*/
- protected int srcrows[];
+ protected int[] srcrows;
/**
* An {@code int} array containing information about a
* column of pixels.
*/
- protected int srccols[];
+ protected int[] srccols;
/**
* A {@code byte} array initialized with a size of
@@ -185,7 +185,7 @@
* with the filtering operation.
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, byte pixels[], int off,
+ ColorModel model, byte[] pixels, int off,
int scansize) {
if (srcrows == null || srccols == null) {
calculateMaps();
@@ -193,7 +193,7 @@
int sx, sy;
int dx1 = (2 * x * destWidth + srcWidth - 1) / (2 * srcWidth);
int dy1 = (2 * y * destHeight + srcHeight - 1) / (2 * srcHeight);
- byte outpix[];
+ byte[] outpix;
if (outpixbuf != null && outpixbuf instanceof byte[]) {
outpix = (byte[]) outpixbuf;
} else {
@@ -226,7 +226,7 @@
* with the filtering operation.
*/
public void setPixels(int x, int y, int w, int h,
- ColorModel model, int pixels[], int off,
+ ColorModel model, int[] pixels, int off,
int scansize) {
if (srcrows == null || srccols == null) {
calculateMaps();
@@ -234,7 +234,7 @@
int sx, sy;
int dx1 = (2 * x * destWidth + srcWidth - 1) / (2 * srcWidth);
int dy1 = (2 * y * destHeight + srcHeight - 1) / (2 * srcHeight);
- int outpix[];
+ int[] outpix;
if (outpixbuf != null && outpixbuf instanceof int[]) {
outpix = (int[]) outpixbuf;
} else {
--- a/src/java.desktop/share/classes/java/awt/image/RescaleOp.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/RescaleOp.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -144,7 +144,7 @@
* this {@code RescaleOp}
* @return the scale factors of this {@code RescaleOp}.
*/
- public final float[] getScaleFactors (float scaleFactors[]) {
+ public final float[] getScaleFactors (float[] scaleFactors) {
if (scaleFactors == null) {
return this.scaleFactors.clone();
}
@@ -162,7 +162,7 @@
* this {@code RescaleOp}
* @return the offsets of this {@code RescaleOp}.
*/
- public final float[] getOffsets(float offsets[]) {
+ public final float[] getOffsets(float[] offsets) {
if (offsets == null) {
return this.offsets.clone();
}
@@ -190,8 +190,8 @@
* This will generally be 256 for byte and
* 65536 for short.
*/
- private ByteLookupTable createByteLut(float scale[],
- float off[],
+ private ByteLookupTable createByteLut(float[] scale,
+ float[] off,
int nBands,
int nElems) {
@@ -237,8 +237,8 @@
* This will generally be 256 for byte and
* 65536 for short.
*/
- private ShortLookupTable createShortLut(float scale[],
- float off[],
+ private ShortLookupTable createShortLut(float[] scale,
+ float[] off,
int nBands,
int nElems) {
@@ -562,8 +562,8 @@
// REMIND: This must change if we ever support signed data types.
//
int nbits;
- int dstMax[] = new int[numBands];
- int dstMask[] = new int[numBands];
+ int[] dstMax = new int[numBands];
+ int[] dstMask = new int[numBands];
SampleModel dstSM = dst.getSampleModel();
for (int z=0; z<numBands; z++) {
nbits = dstSM.getSampleSize(z);
--- a/src/java.desktop/share/classes/java/awt/image/SampleModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/SampleModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -234,9 +234,9 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if iArray is too small to hold the output.
*/
- public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+ public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
- int pixels[];
+ int[] pixels;
if (iArray != null)
pixels = iArray;
@@ -698,10 +698,10 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if fArray is too small to hold the output.
*/
- public float[] getPixel(int x, int y, float fArray[],
+ public float[] getPixel(int x, int y, float[] fArray,
DataBuffer data) {
- float pixels[];
+ float[] pixels;
if (fArray != null)
pixels = fArray;
@@ -729,10 +729,10 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if dArray is too small to hold the output.
*/
- public double[] getPixel(int x, int y, double dArray[],
+ public double[] getPixel(int x, int y, double[] dArray,
DataBuffer data) {
- double pixels[];
+ double[] pixels;
if(dArray != null)
pixels = dArray;
@@ -764,9 +764,9 @@
* not in bounds, or if iArray is too small to hold the output.
*/
public int[] getPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
- int pixels[];
+ int[] pixels;
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -812,9 +812,9 @@
* not in bounds, or if fArray is too small to hold the output.
*/
public float[] getPixels(int x, int y, int w, int h,
- float fArray[], DataBuffer data) {
+ float[] fArray, DataBuffer data) {
- float pixels[];
+ float[] pixels;
int Offset = 0;
int x1 = x + w;
int y1 = y + h;
@@ -860,8 +860,8 @@
* not in bounds, or if dArray is too small to hold the output.
*/
public double[] getPixels(int x, int y, int w, int h,
- double dArray[], DataBuffer data) {
- double pixels[];
+ double[] dArray, DataBuffer data) {
+ double[] pixels;
int Offset = 0;
int x1 = x + w;
int y1 = y + h;
@@ -976,8 +976,8 @@
* hold the output.
*/
public int[] getSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
- int pixels[];
+ int[] iArray, DataBuffer data) {
+ int[] pixels;
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1024,9 +1024,9 @@
* hold the output.
*/
public float[] getSamples(int x, int y, int w, int h,
- int b, float fArray[],
+ int b, float[] fArray,
DataBuffer data) {
- float pixels[];
+ float[] pixels;
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1073,9 +1073,9 @@
* hold the output.
*/
public double[] getSamples(int x, int y, int w, int h,
- int b, double dArray[],
+ int b, double[] dArray,
DataBuffer data) {
- double pixels[];
+ double[] pixels;
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1114,7 +1114,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if iArray is too small to hold the input.
*/
- public void setPixel(int x, int y, int iArray[], DataBuffer data) {
+ public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
for (int i=0; i<numBands; i++)
setSample(x, y, i, iArray[i], data);
@@ -1134,7 +1134,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if fArray is too small to hold the input.
*/
- public void setPixel(int x, int y, float fArray[], DataBuffer data) {
+ public void setPixel(int x, int y, float[] fArray, DataBuffer data) {
for (int i=0; i<numBands; i++)
setSample(x, y, i, fArray[i], data);
@@ -1153,7 +1153,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if fArray is too small to hold the input.
*/
- public void setPixel(int x, int y, double dArray[], DataBuffer data) {
+ public void setPixel(int x, int y, double[] dArray, DataBuffer data) {
for (int i=0; i<numBands; i++)
setSample(x, y, i, dArray[i], data);
@@ -1177,7 +1177,7 @@
* not in bounds, or if iArray is too small to hold the input.
*/
public void setPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1215,7 +1215,7 @@
* not in bounds, or if fArray is too small to hold the input.
*/
public void setPixels(int x, int y, int w, int h,
- float fArray[], DataBuffer data) {
+ float[] fArray, DataBuffer data) {
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1253,7 +1253,7 @@
* not in bounds, or if dArray is too small to hold the input.
*/
public void setPixels(int x, int y, int w, int h,
- double dArray[], DataBuffer data) {
+ double[] dArray, DataBuffer data) {
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1369,7 +1369,7 @@
* hold the input.
*/
public void setSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int Offset=0;
int x1 = x + w;
@@ -1407,7 +1407,7 @@
* hold the input.
*/
public void setSamples(int x, int y, int w, int h, int b,
- float fArray[], DataBuffer data) {
+ float[] fArray, DataBuffer data) {
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1445,7 +1445,7 @@
* hold the input.
*/
public void setSamples(int x, int y, int w, int h, int b,
- double dArray[], DataBuffer data) {
+ double[] dArray, DataBuffer data) {
int Offset=0;
int x1 = x + w;
int y1 = y + h;
@@ -1483,7 +1483,7 @@
* @return a {@code SampleModel} with a subset of bands of this
* {@code SampleModel}.
*/
- public abstract SampleModel createSubsetSampleModel(int bands[]);
+ public abstract SampleModel createSubsetSampleModel(int[] bands);
/**
* Creates a DataBuffer that corresponds to this SampleModel.
--- a/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -46,7 +46,7 @@
* Constants
*/
- short data[][];
+ short[][] data;
/**
* Constructs a ShortLookupTable object from an array of short
@@ -60,7 +60,7 @@
* @param data an array of short arrays representing a lookup
* table for each band
*/
- public ShortLookupTable(int offset, short data[][]) {
+ public ShortLookupTable(int offset, short[][] data) {
super(offset,data.length);
numComponents = data.length;
numEntries = data[0].length;
@@ -81,7 +81,7 @@
* before indexing into the arrays
* @param data an array of shorts
*/
- public ShortLookupTable(int offset, short data[]) {
+ public ShortLookupTable(int offset, short[] data) {
super(offset,data.length);
numComponents = 1;
numEntries = data.length;
--- a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -66,13 +66,13 @@
public class SinglePixelPackedSampleModel extends SampleModel
{
/** Bit masks for all bands of the image data. */
- private int bitMasks[];
+ private int[] bitMasks;
/** Bit Offsets for all bands of the image data. */
- private int bitOffsets[];
+ private int[] bitOffsets;
/** Bit sizes for all the bands of the image data. */
- private int bitSizes[];
+ private int[] bitSizes;
/** Maximum bit size. */
private int maxBitSize;
@@ -106,7 +106,7 @@
* {@code DataBuffer.TYPE_INT}
*/
public SinglePixelPackedSampleModel(int dataType, int w, int h,
- int bitMasks[]) {
+ int[] bitMasks) {
this(dataType, w, h, w, bitMasks);
if (dataType != DataBuffer.TYPE_BYTE &&
dataType != DataBuffer.TYPE_USHORT &&
@@ -140,7 +140,7 @@
* {@code DataBuffer.TYPE_INT}
*/
public SinglePixelPackedSampleModel(int dataType, int w, int h,
- int scanlineStride, int bitMasks[]) {
+ int scanlineStride, int[] bitMasks) {
super(dataType, w, h, bitMasks.length);
if (dataType != DataBuffer.TYPE_BYTE &&
dataType != DataBuffer.TYPE_USHORT &&
@@ -306,12 +306,12 @@
* greater than the number of bands in
* the sample model.
*/
- public SampleModel createSubsetSampleModel(int bands[]) {
+ public SampleModel createSubsetSampleModel(int[] bands) {
if (bands.length > numBands)
throw new RasterFormatException("There are only " +
numBands +
" bands");
- int newBitMasks[] = new int[bands.length];
+ int[] newBitMasks = new int[bands.length];
for (int i=0; i<bands.length; i++)
newBitMasks[i] = bitMasks[bands[i]];
@@ -426,12 +426,12 @@
* @return all samples for the specified pixel.
* @see #setPixel(int, int, int[], DataBuffer)
*/
- public int [] getPixel(int x, int y, int iArray[], DataBuffer data) {
+ public int [] getPixel(int x, int y, int[] iArray, DataBuffer data) {
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int pixels[];
+ int[] pixels;
if (iArray == null) {
pixels = new int [numBands];
} else {
@@ -460,7 +460,7 @@
* @see #setPixels(int, int, int, int, int[], DataBuffer)
*/
public int[] getPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int x1 = x + w;
int y1 = y + h;
@@ -470,7 +470,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int pixels[];
+ int[] pixels;
if (iArray != null) {
pixels = iArray;
} else {
@@ -532,13 +532,13 @@
* @see #setSamples(int, int, int, int, int, int[], DataBuffer)
*/
public int[] getSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
// Bounds check for 'b' will be performed automatically
if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int samples[];
+ int[] samples;
if (iArray != null) {
samples = iArray;
} else {
@@ -634,7 +634,7 @@
* @see #getPixel(int, int, int[], DataBuffer)
*/
public void setPixel(int x, int y,
- int iArray[],
+ int[] iArray,
DataBuffer data) {
if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
throw new ArrayIndexOutOfBoundsException
@@ -663,7 +663,7 @@
* @see #getPixels(int, int, int, int, int[], DataBuffer)
*/
public void setPixels(int x, int y, int w, int h,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
int x1 = x + w;
int y1 = y + h;
@@ -732,7 +732,7 @@
* @see #getSamples(int, int, int, int, int, int[], DataBuffer)
*/
public void setSamples(int x, int y, int w, int h, int b,
- int iArray[], DataBuffer data) {
+ int[] iArray, DataBuffer data) {
// Bounds check for 'b' will be performed automatically
if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
throw new ArrayIndexOutOfBoundsException
--- a/src/java.desktop/share/classes/java/awt/image/WritableRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/WritableRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -217,7 +217,7 @@
public WritableRaster createWritableChild(int parentX, int parentY,
int w, int h,
int childMinX, int childMinY,
- int bandList[]) {
+ int[] bandList) {
if (parentX < this.minX) {
throw new RasterFormatException("parentX lies outside raster");
}
@@ -504,7 +504,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if iArray is too small to hold the input.
*/
- public void setPixel(int x, int y, int iArray[]) {
+ public void setPixel(int x, int y, int[] iArray) {
sampleModel.setPixel(x-sampleModelTranslateX,y-sampleModelTranslateY,
iArray,dataBuffer);
}
@@ -522,7 +522,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if fArray is too small to hold the input.
*/
- public void setPixel(int x, int y, float fArray[]) {
+ public void setPixel(int x, int y, float[] fArray) {
sampleModel.setPixel(x-sampleModelTranslateX,y-sampleModelTranslateY,
fArray,dataBuffer);
}
@@ -540,7 +540,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if dArray is too small to hold the input.
*/
- public void setPixel(int x, int y, double dArray[]) {
+ public void setPixel(int x, int y, double[] dArray) {
sampleModel.setPixel(x-sampleModelTranslateX,y-sampleModelTranslateY,
dArray,dataBuffer);
}
@@ -561,7 +561,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if iArray is too small to hold the input.
*/
- public void setPixels(int x, int y, int w, int h, int iArray[]) {
+ public void setPixels(int x, int y, int w, int h, int[] iArray) {
sampleModel.setPixels(x-sampleModelTranslateX,y-sampleModelTranslateY,
w,h,iArray,dataBuffer);
}
@@ -582,7 +582,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if fArray is too small to hold the input.
*/
- public void setPixels(int x, int y, int w, int h, float fArray[]) {
+ public void setPixels(int x, int y, int w, int h, float[] fArray) {
sampleModel.setPixels(x-sampleModelTranslateX,y-sampleModelTranslateY,
w,h,fArray,dataBuffer);
}
@@ -603,7 +603,7 @@
* @throws ArrayIndexOutOfBoundsException if the coordinates are not
* in bounds, or if dArray is too small to hold the input.
*/
- public void setPixels(int x, int y, int w, int h, double dArray[]) {
+ public void setPixels(int x, int y, int w, int h, double[] dArray) {
sampleModel.setPixels(x-sampleModelTranslateX,y-sampleModelTranslateY,
w,h,dArray,dataBuffer);
}
@@ -685,7 +685,7 @@
* hold the input.
*/
public void setSamples(int x, int y, int w, int h, int b,
- int iArray[]) {
+ int[] iArray) {
sampleModel.setSamples(x-sampleModelTranslateX,y-sampleModelTranslateY,
w,h,b,iArray,dataBuffer);
}
@@ -709,7 +709,7 @@
* hold the input.
*/
public void setSamples(int x, int y, int w, int h, int b,
- float fArray[]) {
+ float[] fArray) {
sampleModel.setSamples(x-sampleModelTranslateX,y-sampleModelTranslateY,
w,h,b,fArray,dataBuffer);
}
@@ -733,7 +733,7 @@
* hold the input.
*/
public void setSamples(int x, int y, int w, int h, int b,
- double dArray[]) {
+ double[] dArray) {
sampleModel.setSamples(x-sampleModelTranslateX,y-sampleModelTranslateY,
w,h,b,dArray,dataBuffer);
}
--- a/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -192,10 +192,10 @@
// Get RGB pixels from the raster scanline by scanline and
// send to consumers.
- int pix[] = new int[width];
+ int[] pix = new int[width];
int i,j;
int numBands = sampleModel.getNumBands();
- int tmpPixel[] = new int[numBands];
+ int[] tmpPixel = new int[numBands];
for (j = 0; j < height; j++) {
for(i = 0; i < width; i++) {
sampleModel.getPixel(i, j, tmpPixel, dataBuffer);
--- a/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -120,7 +120,7 @@
public EventSetDescriptor(Class<?> sourceClass,
String eventSetName,
Class<?> listenerType,
- String listenerMethodNames[],
+ String[] listenerMethodNames,
String addListenerMethodName,
String removeListenerMethodName)
throws IntrospectionException {
@@ -153,7 +153,7 @@
public EventSetDescriptor(Class<?> sourceClass,
String eventSetName,
Class<?> listenerType,
- String listenerMethodNames[],
+ String[] listenerMethodNames,
String addListenerMethodName,
String removeListenerMethodName,
String getListenerMethodName)
@@ -215,7 +215,7 @@
*/
public EventSetDescriptor(String eventSetName,
Class<?> listenerType,
- Method listenerMethods[],
+ Method[] listenerMethods,
Method addListenerMethod,
Method removeListenerMethod)
throws IntrospectionException {
@@ -243,7 +243,7 @@
*/
public EventSetDescriptor(String eventSetName,
Class<?> listenerType,
- Method listenerMethods[],
+ Method[] listenerMethods,
Method addListenerMethod,
Method removeListenerMethod,
Method getListenerMethod)
@@ -285,7 +285,7 @@
*/
public EventSetDescriptor(String eventSetName,
Class<?> listenerType,
- MethodDescriptor listenerMethodDescriptors[],
+ MethodDescriptor[] listenerMethodDescriptors,
Method addListenerMethod,
Method removeListenerMethod)
throws IntrospectionException {
--- a/src/java.desktop/share/classes/java/beans/Introspector.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -121,7 +121,7 @@
private Class<?> beanClass;
private BeanInfo explicitBeanInfo;
private BeanInfo superBeanInfo;
- private BeanInfo additionalBeanInfo[];
+ private BeanInfo[] additionalBeanInfo;
private boolean propertyChangeSource = false;
@@ -322,7 +322,7 @@
Character.isUpperCase(name.charAt(0))){
return name;
}
- char chars[] = name.toCharArray();
+ char[] chars = name.toCharArray();
chars[0] = Character.toLowerCase(chars[0]);
return new String(chars);
}
@@ -459,9 +459,9 @@
// event sets and locate PropertyChangeListeners before we
// look for properties.
BeanDescriptor bd = getTargetBeanDescriptor();
- MethodDescriptor mds[] = getTargetMethodInfo();
- EventSetDescriptor esds[] = getTargetEventInfo();
- PropertyDescriptor pds[] = getTargetPropertyInfo();
+ MethodDescriptor[] mds = getTargetMethodInfo();
+ EventSetDescriptor[] esds = getTargetEventInfo();
+ PropertyDescriptor[] pds = getTargetPropertyInfo();
int defaultEvent = getTargetDefaultEventIndex();
int defaultProperty = getTargetDefaultPropertyIndex();
@@ -526,7 +526,7 @@
processPropertyDescriptors();
// Allocate and populate the result array.
- PropertyDescriptor result[] =
+ PropertyDescriptor[] result =
properties.values().toArray(new PropertyDescriptor[properties.size()]);
// Set the default index.
@@ -924,7 +924,7 @@
if (explicitEvents == null && superBeanInfo != null) {
// We have no explicit BeanInfo events. Check with our parent.
- EventSetDescriptor supers[] = superBeanInfo.getEventSetDescriptors();
+ EventSetDescriptor[] supers = superBeanInfo.getEventSetDescriptors();
for (int i = 0 ; i < supers.length; i++) {
addEvent(supers[i]);
}
@@ -935,7 +935,7 @@
}
for (int i = 0; i < additionalBeanInfo.length; i++) {
- EventSetDescriptor additional[] = additionalBeanInfo[i].getEventSetDescriptors();
+ EventSetDescriptor[] additional = additionalBeanInfo[i].getEventSetDescriptors();
if (additional != null) {
for (int j = 0 ; j < additional.length; j++) {
addEvent(additional[j]);
@@ -1020,14 +1020,14 @@
if (explicitMethods == null && superBeanInfo != null) {
// We have no explicit BeanInfo methods. Check with our parent.
- MethodDescriptor supers[] = superBeanInfo.getMethodDescriptors();
+ MethodDescriptor[] supers = superBeanInfo.getMethodDescriptors();
for (int i = 0 ; i < supers.length; i++) {
addMethod(supers[i]);
}
}
for (int i = 0; i < additionalBeanInfo.length; i++) {
- MethodDescriptor additional[] = additionalBeanInfo[i].getMethodDescriptors();
+ MethodDescriptor[] additional = additionalBeanInfo[i].getMethodDescriptors();
if (additional != null) {
for (int j = 0 ; j < additional.length; j++) {
addMethod(additional[j]);
@@ -1049,7 +1049,7 @@
}
// Allocate and populate the result array.
- MethodDescriptor result[] = new MethodDescriptor[methods.size()];
+ MethodDescriptor[] result = new MethodDescriptor[methods.size()];
result = methods.values().toArray(result);
return result;
@@ -1155,7 +1155,7 @@
private boolean isEventHandler(Method m) {
// We assume that a method is an event handler if it has a single
// argument, whose type inherit from java.util.Event.
- Type argTypes[] = m.getGenericParameterTypes();
+ Type[] argTypes = m.getGenericParameterTypes();
if (argTypes.length != 1) {
return false;
}
@@ -1171,7 +1171,7 @@
* parameter list on a given class.
*/
private static Method internalFindMethod(Class<?> start, String methodName,
- int argCount, Class<?> args[]) {
+ int argCount, Class<?>[] args) {
// For overriden methods we need to find the most derived version.
// So we start with the given class and walk up the superclass chain.
for (Class<?> cl = start; cl != null; cl = cl.getSuperclass()) {
--- a/src/java.desktop/share/classes/java/beans/MetaData.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/beans/MetaData.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -756,7 +756,7 @@
static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
protected void installFields(Encoder out, Class<?> cls) {
if (Modifier.isPublic(cls.getModifiers()) && isPackageAccessible(cls)) {
- Field fields[] = cls.getFields();
+ Field[] fields = cls.getFields();
for(int i = 0; i < fields.length; i++) {
Field field = fields[i];
// Don't install primitives, their identity will not be preserved
--- a/src/java.desktop/share/classes/java/beans/MethodDescriptor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/java/beans/MethodDescriptor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -46,7 +46,7 @@
private List<WeakReference<Class<?>>> params;
- private ParameterDescriptor parameterDescriptors[];
+ private ParameterDescriptor[] parameterDescriptors;
/**
* Constructs a {@code MethodDescriptor} from a
@@ -69,7 +69,7 @@
* method's parameters.
*/
public MethodDescriptor(Method method,
- ParameterDescriptor parameterDescriptors[]) {
+ ParameterDescriptor[] parameterDescriptors) {
setName(method.getName());
setMethod(method);
this.parameterDescriptors = (parameterDescriptors != null)
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -87,7 +87,7 @@
* {@code null}.
* @exception IOException if an I/O error occurs.
*/
- void write(byte b[]) throws IOException;
+ void write(byte[] b) throws IOException;
/**
* Writes a sequence of bytes to the stream at the current
@@ -114,7 +114,7 @@
* {@code null}.
* @exception IOException if an I/O error occurs.
*/
- void write(byte b[], int off, int len) throws IOException;
+ void write(byte[] b, int off, int len) throws IOException;
/**
* Writes a {@code boolean} value to the stream. If
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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,11 +47,11 @@
public abstract void write(int b) throws IOException;
- public void write(byte b[]) throws IOException {
+ public void write(byte[] b) throws IOException {
write(b, 0, b.length);
}
- public abstract void write(byte b[], int off, int len) throws IOException;
+ public abstract void write(byte[] b, int off, int len) throws IOException;
public void writeBoolean(boolean v) throws IOException {
write(v ? 1 : 0);
--- a/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java Wed Oct 24 13:35:18 2018 +0530
@@ -853,7 +853,7 @@
allTypes.add(types[j]);
}
}
- int resultTypes[] = new int[allTypes.size()];
+ int[] resultTypes = new int[allTypes.size()];
int index = 0;
Iterator<Integer> iterator = allTypes.iterator();
while (iterator.hasNext()) {
@@ -908,7 +908,7 @@
allTypes.add(types[j]);
}
}
- int resultTypes[] = new int[allTypes.size()];
+ int[] resultTypes = new int[allTypes.size()];
int index = 0;
Iterator<Integer> iterator = allTypes.iterator();
while (iterator.hasNext()) {
--- a/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java Wed Oct 24 13:35:18 2018 +0530
@@ -676,7 +676,7 @@
List<FormatConversionProvider> codecs = getFormatConversionProviders();
Vector<AudioFormat.Encoding> encodings = new Vector<>();
- AudioFormat.Encoding encs[] = null;
+ AudioFormat.Encoding[] encs = null;
// gather from all the codecs
for(int i=0; i<codecs.size(); i++ ) {
@@ -1084,7 +1084,7 @@
returnTypesSet.add(fileTypes[j]);
}
}
- AudioFileFormat.Type returnTypes[] =
+ AudioFileFormat.Type[] returnTypes =
returnTypesSet.toArray(new AudioFileFormat.Type[0]);
return returnTypes;
}
@@ -1133,7 +1133,7 @@
returnTypesSet.add(fileTypes[j]);
}
}
- AudioFileFormat.Type returnTypes[] =
+ AudioFileFormat.Type[] returnTypes =
returnTypesSet.toArray(new AudioFileFormat.Type[0]);
return returnTypes;
}
--- a/src/java.desktop/share/classes/javax/swing/AbstractButton.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/AbstractButton.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -2605,7 +2605,7 @@
}
Rectangle2D.Float shape =
new Rectangle2D.Float(r.x, r.y, r.width, r.height);
- Position.Bias bias[] = new Position.Bias[1];
+ Position.Bias[] bias = new Position.Bias[1];
return view.viewToModel(p.x, p.y, shape, bias);
} else {
return -1;
--- a/src/java.desktop/share/classes/javax/swing/ArrayTable.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/ArrayTable.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -58,7 +58,7 @@
* AbstractAction use to avoid having the same code in each class.
*/
static void writeArrayTable(ObjectOutputStream s, ArrayTable table) throws IOException {
- Object keys[];
+ Object[] keys;
if (table == null || (keys = table.getKeys(null)) == null) {
s.writeInt(0);
--- a/src/java.desktop/share/classes/javax/swing/DebugGraphics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/DebugGraphics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -770,7 +770,7 @@
/**
* Overrides <code>Graphics.drawPolyline</code>.
*/
- public void drawPolyline(int xPoints[], int yPoints[], int nPoints) {
+ public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) {
DebugGraphicsInfo info = info();
if (debugLog()) {
@@ -805,7 +805,7 @@
/**
* Overrides <code>Graphics.drawPolygon</code>.
*/
- public void drawPolygon(int xPoints[], int yPoints[], int nPoints) {
+ public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) {
DebugGraphicsInfo info = info();
if (debugLog()) {
@@ -840,7 +840,7 @@
/**
* Overrides <code>Graphics.fillPolygon</code>.
*/
- public void fillPolygon(int xPoints[], int yPoints[], int nPoints) {
+ public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) {
DebugGraphicsInfo info = info();
if (debugLog()) {
@@ -945,7 +945,7 @@
/**
* Overrides <code>Graphics.drawBytes</code>.
*/
- public void drawBytes(byte data[], int offset, int length, int x, int y) {
+ public void drawBytes(byte[] data, int offset, int length, int x, int y) {
DebugGraphicsInfo info = info();
Font font = graphics.getFont();
@@ -981,7 +981,7 @@
/**
* Overrides <code>Graphics.drawChars</code>.
*/
- public void drawChars(char data[], int offset, int length, int x, int y) {
+ public void drawChars(char[] data, int offset, int length, int x, int y) {
DebugGraphicsInfo info = info();
Font font = graphics.getFont();
--- a/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -55,7 +55,7 @@
*
* @param items an array of Object objects
*/
- public DefaultComboBoxModel(final E items[]) {
+ public DefaultComboBoxModel(final E[] items) {
objects = new Vector<E>(items.length);
int i,c;
--- a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -98,7 +98,7 @@
* @param anArray the array into which the components get copied
* @see Vector#copyInto(Object[])
*/
- public void copyInto(Object anArray[]) {
+ public void copyInto(Object[] anArray) {
delegate.copyInto(anArray);
}
--- a/src/java.desktop/share/classes/javax/swing/GroupLayout.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/GroupLayout.java Wed Oct 24 13:35:18 2018 +0530
@@ -430,7 +430,7 @@
* indicates that if {@code component} is not visible it should
* not be treated as part of the layout. A value of {@code false}
* indicates that {@code component} is positioned and sized
- * regardless of it's visibility. A value of {@code null}
+ * regardless of its visibility. A value of {@code null}
* indicates the value specified by the single argument method {@code
* setHonorsVisibility} should be used.
* <p>
@@ -667,7 +667,7 @@
}
/**
- * Creates and returns a {@code ParallelGroup} that aligns it's
+ * Creates and returns a {@code ParallelGroup} that aligns its
* elements along the baseline.
*
* @param resizable whether the group is resizable
@@ -2373,12 +2373,12 @@
/**
- * A {@code Group} that aligns and sizes it's children.
- * {@code ParallelGroup} aligns it's children in
+ * A {@code Group} that aligns and sizes its children.
+ * {@code ParallelGroup} aligns its children in
* four possible ways: along the baseline, centered, anchored to the
* leading edge, or anchored to the trailing edge.
* <h3>Baseline</h3>
- * A {@code ParallelGroup} that aligns it's children along the
+ * A {@code ParallelGroup} that aligns its children along the
* baseline must first decide where the baseline is
* anchored. The baseline can either be anchored to the top, or
* anchored to the bottom of the group. That is, the distance between the
@@ -2415,7 +2415,7 @@
* {@code maxDescent} is the maximum descent (preferred height - baseline)
* of all elements that have a baseline and are aligned along the baseline.
* <p>
- * A {@code ParallelGroup} that aligns it's elements along the baseline
+ * A {@code ParallelGroup} that aligns its elements along the baseline
* is only useful along the vertical axis. If you create a
* baseline group and use it along the horizontal axis an
* {@code IllegalStateException} is thrown when you ask
--- a/src/java.desktop/share/classes/javax/swing/JComboBox.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JComboBox.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1305,7 +1305,7 @@
if ( selectedObject == null )
return new Object[0];
else {
- Object result[] = new Object[1];
+ Object[] result = new Object[1];
result[0] = selectedObject;
return result;
}
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -3461,7 +3461,7 @@
// This class is used by the KeyboardState class to provide a single
// instance that can be stored in the AppContext.
static final class IntVector {
- int array[] = null;
+ int[] array = null;
int count = 0;
int capacity = 0;
--- a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -133,7 +133,7 @@
setFocusTraversalPolicy(new LayoutFocusTraversalPolicy() {
public Component getDefaultComponent(Container c) {
- JInternalFrame jifArray[] = getAllFrames();
+ JInternalFrame[] jifArray = getAllFrames();
Component comp = null;
for (JInternalFrame jif : jifArray) {
comp = jif.getFocusTraversalPolicy().getDefaultComponent(jif);
--- a/src/java.desktop/share/classes/javax/swing/JLabel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1149,7 +1149,7 @@
}
Rectangle2D.Float shape =
new Rectangle2D.Float(r.x, r.y, r.width, r.height);
- Position.Bias bias[] = new Position.Bias[1];
+ Position.Bias[] bias = new Position.Bias[1];
return view.viewToModel(p.x, p.y, shape, bias);
} else {
return -1;
--- a/src/java.desktop/share/classes/javax/swing/JMenu.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JMenu.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1202,7 +1202,7 @@
if(popupMenu == null)
return new MenuElement[0];
else {
- MenuElement result[] = new MenuElement[1];
+ MenuElement[] result = new MenuElement[1];
result[0] = popupMenu;
return result;
}
@@ -1285,7 +1285,7 @@
* button was pressed for
*/
public void doClick(int pressTime) {
- MenuElement me[] = buildMenuElementArray(this);
+ MenuElement[] me = buildMenuElementArray(this);
MenuSelectionManager.defaultManager().setSelectedPath(me);
}
@@ -1319,7 +1319,7 @@
break;
}
}
- MenuElement me[] = new MenuElement[elements.size()];
+ MenuElement[] me = new MenuElement[elements.size()];
elements.copyInto(me);
return me;
}
@@ -1471,7 +1471,7 @@
* @return 1 if a menu is currently selected, else 0
*/
public int getAccessibleSelectionCount() {
- MenuElement me[] =
+ MenuElement[] me =
MenuSelectionManager.defaultManager().getSelectedPath();
if (me != null) {
for (int i = 0; i < me.length; i++) {
@@ -1496,7 +1496,7 @@
if (i < 0 || i >= getItemCount()) {
return null;
}
- MenuElement me[] =
+ MenuElement[] me =
MenuSelectionManager.defaultManager().getSelectedPath();
if (me != null) {
for (int j = 0; j < me.length; j++) {
@@ -1524,7 +1524,7 @@
*/
public boolean isAccessibleChildSelected(int i) {
// if i is a sub-menu and is pop-ed up, return true, else false
- MenuElement me[] =
+ MenuElement[] me =
MenuSelectionManager.defaultManager().getSelectedPath();
if (me != null) {
JMenuItem mi = JMenu.this.getItem(i);
@@ -1556,7 +1556,7 @@
JMenuItem mi = getItem(i);
if (mi != null) {
if (mi instanceof JMenu) {
- MenuElement me[] = buildMenuElementArray((JMenu) mi);
+ MenuElement[] me = buildMenuElementArray((JMenu) mi);
MenuSelectionManager.defaultManager().setSelectedPath(me);
} else {
MenuSelectionManager.defaultManager().setSelectedPath(null);
@@ -1578,9 +1578,9 @@
JMenuItem mi = getItem(i);
if (mi != null && mi instanceof JMenu) {
if (mi.isSelected()) {
- MenuElement old[] =
+ MenuElement[] old =
MenuSelectionManager.defaultManager().getSelectedPath();
- MenuElement me[] = new MenuElement[old.length-2];
+ MenuElement[] me = new MenuElement[old.length-2];
for (int j = 0; j < old.length -2; j++) {
me[j] = old[j];
}
@@ -1596,12 +1596,12 @@
public void clearAccessibleSelection() {
// if this menu is selected, reset selection to only go
// to this menu; else do nothing
- MenuElement old[] =
+ MenuElement[] old =
MenuSelectionManager.defaultManager().getSelectedPath();
if (old != null) {
for (int j = 0; j < old.length; j++) {
if (old[j] == JMenu.this) { // menu is in the selection!
- MenuElement me[] = new MenuElement[j+1];
+ MenuElement[] me = new MenuElement[j+1];
System.arraycopy(old, 0, me, 0, j);
me[j] = JMenu.this.getPopupMenu();
MenuSelectionManager.defaultManager().setSelectedPath(me);
--- a/src/java.desktop/share/classes/javax/swing/JMenuBar.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JMenuBar.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -391,7 +391,7 @@
*
* @see #getSubElements
*/
- public void processMouseEvent(MouseEvent event,MenuElement path[],MenuSelectionManager manager) {
+ public void processMouseEvent(MouseEvent event,MenuElement[] path,MenuSelectionManager manager) {
}
/**
@@ -399,7 +399,7 @@
*
* @see #getSubElements
*/
- public void processKeyEvent(KeyEvent e,MenuElement path[],MenuSelectionManager manager) {
+ public void processKeyEvent(KeyEvent e,MenuElement[] path,MenuSelectionManager manager) {
}
/**
@@ -420,7 +420,7 @@
*/
@BeanProperty(bound = false)
public MenuElement[] getSubElements() {
- MenuElement result[];
+ MenuElement[] result;
Vector<MenuElement> tmp = new Vector<MenuElement>();
int c = getComponentCount();
int i;
@@ -610,7 +610,7 @@
getSelectionModel().setSelectedIndex(i);
JMenu menu = getMenu(i);
if (menu != null) {
- MenuElement me[] = new MenuElement[3];
+ MenuElement[] me = new MenuElement[3];
me[0] = JMenuBar.this;
me[1] = menu;
me[2] = menu.getPopupMenu();
--- a/src/java.desktop/share/classes/javax/swing/JMenuItem.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JMenuItem.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -413,7 +413,7 @@
* @param manager the <code>MenuSelectionManager</code>
*/
@SuppressWarnings("deprecation")
- public void processMouseEvent(MouseEvent e,MenuElement path[],MenuSelectionManager manager) {
+ public void processMouseEvent(MouseEvent e,MenuElement[] path,MenuSelectionManager manager) {
processMenuDragMouseEvent(
new MenuDragMouseEvent(e.getComponent(), e.getID(),
e.getWhen(),
@@ -437,7 +437,7 @@
* @param manager the <code>MenuSelectionManager</code>
*/
@SuppressWarnings("deprecation")
- public void processKeyEvent(KeyEvent e,MenuElement path[],MenuSelectionManager manager) {
+ public void processKeyEvent(KeyEvent e,MenuElement[] path,MenuSelectionManager manager) {
if (DEBUG) {
System.out.println("in JMenuItem.processKeyEvent/3 for " + getText() +
" " + KeyStroke.getKeyStrokeForEvent(e));
--- a/src/java.desktop/share/classes/javax/swing/JPasswordField.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JPasswordField.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -471,7 +471,7 @@
} else {
// Treat the text displayed in the JPasswordField
// as one word and sentence.
- char password[] = getPassword();
+ char[] password = getPassword();
if (password == null ||
index < 0 || index >= password.length) {
return null;
@@ -582,7 +582,7 @@
} else {
// Treat the text displayed in the JPasswordField
// as one word, sentence, line and attribute run
- char password[] = getPassword();
+ char[] password = getPassword();
if (password == null ||
index < 0 || index >= password.length) {
return null;
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -774,7 +774,7 @@
// This is a popup menu with MenuElement children,
// set selection path before popping up!
if (isPopupMenu()) {
- MenuElement me[] = new MenuElement[1];
+ MenuElement[] me = new MenuElement[1];
me[0] = this;
MenuSelectionManager.defaultManager().setSelectedPath(me);
}
@@ -1371,7 +1371,7 @@
* <code>MenuElement</code> interface, but it not implemented.
* @see MenuElement#processMouseEvent(MouseEvent, MenuElement[], MenuSelectionManager)
*/
- public void processMouseEvent(MouseEvent event,MenuElement path[],MenuSelectionManager manager) {}
+ public void processMouseEvent(MouseEvent event,MenuElement[] path,MenuSelectionManager manager) {}
/**
* Processes a key event forwarded from the
@@ -1386,7 +1386,7 @@
* @param manager the <code>MenuSelectionManager</code>
*/
@SuppressWarnings("deprecation")
- public void processKeyEvent(KeyEvent e, MenuElement path[],
+ public void processKeyEvent(KeyEvent e, MenuElement[] path,
MenuSelectionManager manager) {
MenuKeyEvent mke = new MenuKeyEvent(e.getComponent(), e.getID(),
e.getWhen(), e.getModifiers(),
@@ -1504,7 +1504,7 @@
*/
@BeanProperty(bound = false)
public MenuElement[] getSubElements() {
- MenuElement result[];
+ MenuElement[] result;
Vector<MenuElement> tmp = new Vector<MenuElement>();
int c = getComponentCount();
int i;
--- a/src/java.desktop/share/classes/javax/swing/JSpinner.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JSpinner.java Wed Oct 24 13:35:18 2018 +0530
@@ -769,7 +769,7 @@
// the text field font was not set by the user
Font font = spinner.getFont();
if (!newfont.equals(font)) {
- getTextField().setFont(new FontUIResource(font));
+ getTextField().setFont(font == null ? null : new FontUIResource(font));
}
}
}
--- a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1000,7 +1000,7 @@
// container's children array indices, so make sure we
// remove the correct child!
if (component != null) {
- Component components[] = getComponents();
+ Component[] components = getComponents();
for (int i = components.length; --i >= 0; ) {
if (components[i] == component) {
super.remove(i);
@@ -1034,7 +1034,7 @@
} else {
// Container#remove(comp) invokes Container#remove(int)
// so make sure JTabbedPane#remove(int) isn't called here
- Component children[] = getComponents();
+ Component[] children = getComponents();
for (int i=0; i < children.length; i++) {
if (component == children[i]) {
super.remove(i);
@@ -1548,7 +1548,7 @@
// why not if (page.component.getParent() == this) remove(component)
synchronized(getTreeLock()) {
int count = getComponentCount();
- Component children[] = getComponents();
+ Component[] children = getComponents();
for (int i = 0; i < count; i++) {
if (children[i] == page.component) {
super.remove(i);
--- a/src/java.desktop/share/classes/javax/swing/JTable.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -7217,8 +7217,8 @@
int rowsSel = JTable.this.getSelectedRowCount();
int colsSel = JTable.this.getSelectedColumnCount();
- int rowIndicies[] = getSelectedRows();
- int colIndicies[] = getSelectedColumns();
+ int[] rowIndicies = getSelectedRows();
+ int[] colIndicies = getSelectedColumns();
int ttlCols = JTable.this.getColumnCount();
int ttlRows = JTable.this.getRowCount();
int r;
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1809,7 +1809,7 @@
if(lastParent != null && parent instanceof JComponent &&
!((JComponent)parent).isOptimizedDrawingEnabled()) {
- Component comps[] = parent.getComponents();
+ Component[] comps = parent.getComponents();
int index = 0;
for(int i = comps.length - 1 ;i >= 0; i--) {
--- a/src/java.desktop/share/classes/javax/swing/MenuElement.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/MenuElement.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -53,7 +53,7 @@
* @param path the path of the receiving element in the menu hierarchy
* @param manager the {@code MenuSelectionManager} for the menu hierarchy
*/
- public void processMouseEvent(MouseEvent event, MenuElement path[], MenuSelectionManager manager);
+ public void processMouseEvent(MouseEvent event, MenuElement[] path, MenuSelectionManager manager);
/**
@@ -63,7 +63,7 @@
* @param path the path of the receiving element in the menu hierarchy
* @param manager the {@code MenuSelectionManager} for the menu hierarchy
*/
- public void processKeyEvent(KeyEvent event, MenuElement path[], MenuSelectionManager manager);
+ public void processKeyEvent(KeyEvent event, MenuElement[] path, MenuSelectionManager manager);
/**
* Call by the {@code MenuSelectionManager} when the {@code MenuElement} is
--- a/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -139,7 +139,7 @@
* @return an array of MenuElement objects representing the selected path
*/
public MenuElement[] getSelectedPath() {
- MenuElement res[] = new MenuElement[selection.size()];
+ MenuElement[] res = new MenuElement[selection.size()];
int i,c;
for(i=0,c=selection.size();i<c;i++)
res[i] = selection.elementAt(i);
@@ -223,8 +223,8 @@
Rectangle r2;
int cWidth,cHeight;
MenuElement menuElement;
- MenuElement subElements[];
- MenuElement path[];
+ MenuElement[] subElements;
+ MenuElement[] path;
int selectionSize;
p = event.getPoint();
@@ -292,7 +292,7 @@
path[k] = tmp.elementAt(k);
}
path[i+1] = subElements[j];
- MenuElement currentSelection[] = getSelectedPath();
+ MenuElement[] currentSelection = getSelectedPath();
// Enter/exit detection -- needs tuning...
if (currentSelection[currentSelection.length-1] !=
@@ -347,11 +347,11 @@
}
}
- private void printMenuElementArray(MenuElement path[]) {
+ private void printMenuElementArray(MenuElement[] path) {
printMenuElementArray(path, false);
}
- private void printMenuElementArray(MenuElement path[], boolean dumpStack) {
+ private void printMenuElementArray(MenuElement[] path, boolean dumpStack) {
System.out.println("Path is(");
int i, j;
for(i=0,j=path.length; i<j ;i++){
@@ -396,7 +396,7 @@
Rectangle r2;
int cWidth,cHeight;
MenuElement menuElement;
- MenuElement subElements[];
+ MenuElement[] subElements;
int selectionSize;
SwingUtilities.convertPointToScreen(p,source);
@@ -504,7 +504,7 @@
}
private boolean isComponentPartOfCurrentMenu(MenuElement root,Component c) {
- MenuElement children[];
+ MenuElement[] children;
int i,d;
if (root == null)
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -367,7 +367,7 @@
if(contents != null && contents.isFocusable()) {
if(contents instanceof JPopupMenu) {
JPopupMenu jpm = (JPopupMenu) contents;
- Component popComps[] = jpm.getComponents();
+ Component[] popComps = jpm.getComponents();
for (Component popComp : popComps) {
if (!(popComp instanceof MenuElement) &&
!(popComp instanceof JSeparator)) {
--- a/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -124,7 +124,7 @@
* Overrides <code>FilterInputStream.read</code>
* to update the progress monitor after the read.
*/
- public int read(byte b[]) throws IOException {
+ public int read(byte[] b) throws IOException {
int nr = in.read(b);
if (nr > 0) monitor.setProgress(nread += nr);
if (monitor.isCanceled()) {
@@ -141,7 +141,7 @@
* Overrides <code>FilterInputStream.read</code>
* to update the progress monitor after the read.
*/
- public int read(byte b[],
+ public int read(byte[] b,
int off,
int len) throws IOException {
int nr = in.read(b, off, len);
--- a/src/java.desktop/share/classes/javax/swing/SizeSequence.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/SizeSequence.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -122,7 +122,7 @@
public class SizeSequence {
private static int[] emptyArray = new int[0];
- private int a[];
+ private int[] a;
/**
* Creates a new <code>SizeSequence</code> object
@@ -360,7 +360,7 @@
* (<code>0 <= start < (getSizes().length)) AND (length >= 0)</code>
*/
public void insertEntries(int start, int length, int value) {
- int sizes[] = getSizes();
+ int[] sizes = getSizes();
int end = start + length;
int n = a.length + length;
a = new int[n];
@@ -390,7 +390,7 @@
* @param length the number of entries to be removed
*/
public void removeEntries(int start, int length) {
- int sizes[] = getSizes();
+ int[] sizes = getSizes();
int end = start + length;
int n = a.length - length;
a = new int[n];
--- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -310,7 +310,7 @@
return null;
}
if (parent instanceof Container) {
- Component components[] = ((Container)parent).getComponents();
+ Component[] components = ((Container)parent).getComponents();
for (Component comp : components) {
if (comp != null && comp.isVisible()) {
Point loc = comp.getLocation();
@@ -606,7 +606,7 @@
Rectangle t = new Rectangle();
Rectangle a=null,b=null,c=null,d=null;
- Rectangle result[];
+ Rectangle[] result;
int rectCount = 0;
/* rectA contains rectB */
--- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -230,7 +230,7 @@
// Point(20000, 20000))
private GraphicsConfiguration getDrawingGC(Point toFind) {
GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
- GraphicsDevice devices[] = env.getScreenDevices();
+ GraphicsDevice[] devices = env.getScreenDevices();
for (GraphicsDevice device : devices) {
GraphicsConfiguration config = device.getDefaultConfiguration();
Rectangle rect = config.getBounds();
--- a/src/java.desktop/share/classes/javax/swing/TransferHandler.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/TransferHandler.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -1067,7 +1067,7 @@
} catch (IntrospectionException ex) {
return null;
}
- PropertyDescriptor props[] = bi.getPropertyDescriptors();
+ PropertyDescriptor[] props = bi.getPropertyDescriptors();
for (int i=0; i < props.length; i++) {
if (propertyName.equals(props[i].getName())) {
Method reader = props[i].getReadMethod();
--- a/src/java.desktop/share/classes/javax/swing/UIDefaults.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/UIDefaults.java Wed Oct 24 13:35:18 2018 +0530
@@ -32,6 +32,8 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.io.UncheckedIOException;
import java.lang.reflect.*;
import java.util.HashMap;
@@ -808,7 +810,11 @@
getUIError("static createUI() method not found in " + uiClass);
}
catch (Exception e) {
- getUIError("createUI() failed for " + target + " " + e);
+ StringWriter w = new StringWriter();
+ PrintWriter pw = new PrintWriter(w);
+ e.printStackTrace(pw);
+ pw.flush();
+ getUIError("createUI() failed for " + target + "\n" + w);
}
}
--- a/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -49,7 +49,7 @@
*/
@SuppressWarnings("serial")
public class MenuDragMouseEvent extends MouseEvent {
- private MenuElement path[];
+ private MenuElement[] path;
private MenuSelectionManager manager;
/**
@@ -78,7 +78,7 @@
*/
public MenuDragMouseEvent(Component source, int id, long when,
int modifiers, int x, int y, int clickCount,
- boolean popupTrigger, MenuElement p[],
+ boolean popupTrigger, MenuElement[] p,
MenuSelectionManager m) {
super(source, id, when, modifiers, x, y, clickCount, popupTrigger);
path = p;
@@ -117,7 +117,7 @@
public MenuDragMouseEvent(Component source, int id, long when,
int modifiers, int x, int y, int xAbs,
int yAbs, int clickCount,
- boolean popupTrigger, MenuElement p[],
+ boolean popupTrigger, MenuElement[] p,
MenuSelectionManager m) {
super(source, id, when, modifiers, x, y, xAbs, yAbs, clickCount,
popupTrigger, MouseEvent.NOBUTTON);
--- a/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -49,7 +49,7 @@
*/
@SuppressWarnings("serial")
public class MenuKeyEvent extends KeyEvent {
- private MenuElement path[];
+ private MenuElement[] path;
private MenuSelectionManager manager;
/**
@@ -71,7 +71,7 @@
*/
public MenuKeyEvent(Component source, int id, long when, int modifiers,
int keyCode, char keyChar,
- MenuElement p[], MenuSelectionManager m) {
+ MenuElement[] p, MenuSelectionManager m) {
super(source, id, when, modifiers, keyCode, keyChar);
path = p;
manager = m;
--- a/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/filechooser/FileSystemView.java Wed Oct 24 13:35:18 2018 +0530
@@ -583,12 +583,11 @@
}
/**
- * Returns an array of files representing the values to show by default in
- * the file chooser selector.
+ * Returns an array of files representing the values which will be shown
+ * in the file chooser selector.
*
- * @return an array of {@code File} objects.
- * @throws SecurityException if the caller does not have necessary
- * permissions
+ * @return an array of {@code File} objects. The array returned may be
+ * possibly empty if there are no appropriate permissions.
* @since 9
*/
public File[] getChooserComboBoxFiles() {
@@ -596,6 +595,18 @@
}
/**
+ * Returns an array of files representing the values to show by default in
+ * the file chooser shortcuts panel.
+ *
+ * @return an array of {@code File} objects. The array returned may be
+ * possibly empty if there are no appropriate permissions.
+ * @since 12
+ */
+ final public File[] getChooserShortcutPanelFiles() {
+ return (File[]) ShellFolder.get("fileChooserShortcutPanelFolders");
+ }
+
+ /**
* Returns whether the specified file denotes a shell interpreted link which
* can be obtained by the {@link #getLinkLocation(File)}.
*
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -61,7 +61,7 @@
* @param path an array of {@code MenuElement}
* @param manager an instance of {@code MenuSelectionManager}
*/
- public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement path[],MenuSelectionManager manager) {
+ public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement[] path,MenuSelectionManager manager) {
Point p = e.getPoint();
if(p.x >= 0 && p.x < item.getWidth() &&
p.y >= 0 && p.y < item.getHeight()) {
@@ -71,7 +71,7 @@
} else
manager.setSelectedPath(path);
} else if(item.getModel().isArmed()) {
- MenuElement newPath[] = new MenuElement[path.length-1];
+ MenuElement[] newPath = new MenuElement[path.length-1];
int i,c;
for(i=0,c=path.length-1;i<c;i++)
newPath[i] = path[i];
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -269,8 +269,8 @@
// TAKE_FOCUS
JMenuBar menuBar = (JMenuBar)e.getSource();
MenuSelectionManager defaultManager = MenuSelectionManager.defaultManager();
- MenuElement me[];
- MenuElement subElements[];
+ MenuElement[] me;
+ MenuElement[] subElements;
JMenu menu = menuBar.getMenu(0);
if (menu!=null) {
me = new MenuElement[3];
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -868,8 +868,8 @@
*/
public MenuElement[] getPath() {
MenuSelectionManager m = MenuSelectionManager.defaultManager();
- MenuElement oldPath[] = m.getSelectedPath();
- MenuElement newPath[];
+ MenuElement[] oldPath = m.getSelectedPath();
+ MenuElement[] newPath;
int i = oldPath.length;
if (i == 0)
return new MenuElement[0];
@@ -905,7 +905,7 @@
return newPath;
}
- void printMenuElementArray(MenuElement path[], boolean dumpStack) {
+ void printMenuElementArray(MenuElement[] path, boolean dumpStack) {
System.out.println("Path is(");
int i, j;
for(i=0,j=path.length; i<j ;i++){
@@ -1089,9 +1089,9 @@
MenuSelectionManager.defaultManager().processMouseEvent(e);
} else {
- MenuElement path[] = manager.getSelectedPath();
+ MenuElement[] path = manager.getSelectedPath();
if (path.length > 1 && path[path.length-1] == menuItem) {
- MenuElement newPath[] = new MenuElement[path.length-1];
+ MenuElement[] newPath = new MenuElement[path.length-1];
int i,c;
for(i=0,c=path.length-1;i<c;i++)
newPath[i] = path[i];
@@ -1111,12 +1111,12 @@
//
public void menuDragMouseEntered(MenuDragMouseEvent e) {
MenuSelectionManager manager = e.getMenuSelectionManager();
- MenuElement path[] = e.getPath();
+ MenuElement[] path = e.getPath();
manager.setSelectedPath(path);
}
public void menuDragMouseDragged(MenuDragMouseEvent e) {
MenuSelectionManager manager = e.getMenuSelectionManager();
- MenuElement path[] = e.getPath();
+ MenuElement[] path = e.getPath();
manager.setSelectedPath(path);
}
public void menuDragMouseExited(MenuDragMouseEvent e) {}
@@ -1125,7 +1125,7 @@
return;
}
MenuSelectionManager manager = e.getMenuSelectionManager();
- MenuElement path[] = e.getPath();
+ MenuElement[] path = e.getPath();
Point p = e.getPoint();
if (p.x >= 0 && p.x < menuItem.getWidth() &&
p.y >= 0 && p.y < menuItem.getHeight()) {
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -253,7 +253,7 @@
}
private static void appendPath(MenuElement[] path, MenuElement elem) {
- MenuElement newPath[] = new MenuElement[path.length+1];
+ MenuElement[] newPath = new MenuElement[path.length+1];
System.arraycopy(path, 0, newPath, 0, path.length);
newPath[path.length] = elem;
MenuSelectionManager.defaultManager().setSelectedPath(newPath);
@@ -293,8 +293,8 @@
if(force) {
Container cnt = menu.getParent();
if(cnt != null && cnt instanceof JMenuBar) {
- MenuElement me[];
- MenuElement subElements[];
+ MenuElement[] me;
+ MenuElement[] subElements;
subElements = menu.getPopupMenu().getSubElements();
if(subElements.length > 0) {
@@ -312,7 +312,7 @@
defaultManager.setSelectedPath(me);
}
} else {
- MenuElement path[] = defaultManager.getSelectedPath();
+ MenuElement[] path = defaultManager.getSelectedPath();
if(path.length > 0 && path[path.length-1] == menu) {
appendPath(path, menu.getPopupMenu());
}
@@ -503,7 +503,7 @@
} else {
Container cnt = menu.getParent();
if(cnt != null && cnt instanceof JMenuBar) {
- MenuElement me[] = new MenuElement[2];
+ MenuElement[] me = new MenuElement[2];
me[0]=(MenuElement)cnt;
me[1]=menu;
manager.setSelectedPath(me);
@@ -511,7 +511,7 @@
}
}
- MenuElement selectedPath[] = manager.getSelectedPath();
+ MenuElement[] selectedPath = manager.getSelectedPath();
if (selectedPath.length > 0 &&
selectedPath[selectedPath.length-1] != menu.getPopupMenu()) {
@@ -559,7 +559,7 @@
MenuSelectionManager manager =
MenuSelectionManager.defaultManager();
- MenuElement selectedPath[] = manager.getSelectedPath();
+ MenuElement[] selectedPath = manager.getSelectedPath();
if (!menu.isTopLevelMenu()) {
if(!(selectedPath.length > 0 &&
selectedPath[selectedPath.length-1] ==
@@ -574,7 +574,7 @@
} else {
if(selectedPath.length > 0 &&
selectedPath[0] == menu.getParent()) {
- MenuElement newPath[] = new MenuElement[3];
+ MenuElement[] newPath = new MenuElement[3];
// A top level menu's parent is by definition
// a JMenuBar
newPath[0] = (MenuElement)menu.getParent();
@@ -615,13 +615,13 @@
return;
MenuSelectionManager manager = e.getMenuSelectionManager();
- MenuElement path[] = e.getPath();
+ MenuElement[] path = e.getPath();
Point p = e.getPoint();
if(p.x >= 0 && p.x < menuItem.getWidth() &&
p.y >= 0 && p.y < menuItem.getHeight()) {
JMenu menu = (JMenu)menuItem;
- MenuElement selectedPath[] = manager.getSelectedPath();
+ MenuElement[] selectedPath = manager.getSelectedPath();
if(!(selectedPath.length > 0 &&
selectedPath[selectedPath.length-1] ==
menu.getPopupMenu())) {
@@ -665,19 +665,19 @@
}
char key = Character.toLowerCase((char)menuItem.getMnemonic());
- MenuElement path[] = e.getPath();
+ MenuElement[] path = e.getPath();
if (key == Character.toLowerCase(e.getKeyChar())) {
JPopupMenu popupMenu = ((JMenu)menuItem).getPopupMenu();
ArrayList<MenuElement> newList = new ArrayList<>(Arrays.asList(path));
newList.add(popupMenu);
- MenuElement subs[] = popupMenu.getSubElements();
+ MenuElement[] subs = popupMenu.getSubElements();
MenuElement sub =
BasicPopupMenuUI.findEnabledChild(subs, -1, true);
if(sub != null) {
newList.add(sub);
}
MenuSelectionManager manager = e.getMenuSelectionManager();
- MenuElement newPath[] = new MenuElement[0];;
+ MenuElement[] newPath = new MenuElement[0];;
newPath = newList.toArray(newPath);
manager.setSelectedPath(newPath);
e.consume();
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -327,7 +327,7 @@
if (subitem != null) {
lst.add(subitem);
}
- MenuElement newPath[] = new MenuElement[0];
+ MenuElement[] newPath = new MenuElement[0];
newPath = lst.toArray(newPath);
MenuSelectionManager.defaultManager().setSelectedPath(newPath);
e.consume();
@@ -344,12 +344,12 @@
}
MenuSelectionManager manager = e.getMenuSelectionManager();
- MenuElement path[] = e.getPath();
- MenuElement items[] = popupMenu.getSubElements();
+ MenuElement[] path = e.getPath();
+ MenuElement[] items = popupMenu.getSubElements();
int currentIndex = -1;
int matches = 0;
int firstMatch = -1;
- int indexes[] = null;
+ int[] indexes = null;
for (int j = 0; j < items.length; j++) {
if (! (items[j] instanceof JMenuItem)) {
@@ -397,7 +397,7 @@
newItem = items[indexes[(currentIndex + 1) % matches]];
- MenuElement newPath[] = new MenuElement[path.length+1];
+ MenuElement[] newPath = new MenuElement[path.length+1];
System.arraycopy(path, 0, newPath, 0, path.length);
newPath[path.length] = newItem;
manager.setSelectedPath(newPath);
@@ -470,12 +470,12 @@
}
MenuSelectionManager msm = MenuSelectionManager.defaultManager();
- MenuElement path[] = msm.getSelectedPath();
+ MenuElement[] path = msm.getSelectedPath();
MenuElement lastElement;
if(path.length > 0) {
lastElement = path[path.length-1];
if(lastElement instanceof JMenu) {
- MenuElement newPath[] = new MenuElement[path.length+1];
+ MenuElement[] newPath = new MenuElement[path.length+1];
System.arraycopy(path,0,newPath,0,path.length);
newPath[path.length] = ((JMenu)lastElement).getPopupMenu();
msm.setSelectedPath(newPath);
@@ -494,7 +494,7 @@
}
private void selectParentChild(boolean direction) {
MenuSelectionManager msm = MenuSelectionManager.defaultManager();
- MenuElement path[] = msm.getSelectedPath();
+ MenuElement[] path = msm.getSelectedPath();
int len = path.length;
if (direction == PARENT) {
@@ -510,7 +510,7 @@
!((JMenu)path[popupIndex-1]).isTopLevelMenu()) {
// we have a submenu, just close it
- MenuElement newPath[] = new MenuElement[popupIndex];
+ MenuElement[] newPath = new MenuElement[popupIndex];
System.arraycopy(path, 0, newPath, 0, popupIndex);
msm.setSelectedPath(newPath);
return;
@@ -548,7 +548,7 @@
path[0].getSubElements(), currentMenu, direction);
if (nextMenu != null && nextMenu != currentMenu) {
- MenuElement newSelection[];
+ MenuElement[] newSelection;
if (len == 2) {
// menu is selected but its popup not shown
newSelection = new MenuElement[2];
@@ -568,7 +568,7 @@
private void selectItem(boolean direction) {
MenuSelectionManager msm = MenuSelectionManager.defaultManager();
- MenuElement path[] = msm.getSelectedPath();
+ MenuElement[] path = msm.getSelectedPath();
if (path.length == 0) {
return;
}
@@ -638,7 +638,7 @@
} else {
// just select the next item, no path expansion needed
- MenuElement subs[] = path[len-2].getSubElements();
+ MenuElement[] subs = path[len-2].getSubElements();
MenuElement nextChild =
findEnabledChild(subs, path[len-1], direction);
if (nextChild == null) {
@@ -668,7 +668,7 @@
}
private void shortenSelectedPath() {
- MenuElement path[] = MenuSelectionManager.defaultManager().getSelectedPath();
+ MenuElement[] path = MenuSelectionManager.defaultManager().getSelectedPath();
if (path.length <= 2) {
MenuSelectionManager.defaultManager().clearSelectedPath();
return;
@@ -695,13 +695,13 @@
// clear selection for the topLevelMenu
value = path.length;
}
- MenuElement newPath[] = new MenuElement[path.length - value];
+ MenuElement[] newPath = new MenuElement[path.length - value];
System.arraycopy(path, 0, newPath, 0, path.length - value);
MenuSelectionManager.defaultManager().setSelectedPath(newPath);
}
}
- private static MenuElement nextEnabledChild(MenuElement e[],
+ private static MenuElement nextEnabledChild(MenuElement[] e,
int fromIndex, int toIndex) {
for (int i=fromIndex; i<=toIndex; i++) {
if (e[i] != null) {
@@ -716,7 +716,7 @@
return null;
}
- private static MenuElement previousEnabledChild(MenuElement e[],
+ private static MenuElement previousEnabledChild(MenuElement[] e,
int fromIndex, int toIndex) {
for (int i=fromIndex; i>=toIndex; i--) {
if (e[i] != null) {
@@ -731,7 +731,7 @@
return null;
}
- static MenuElement findEnabledChild(MenuElement e[], int fromIndex,
+ static MenuElement findEnabledChild(MenuElement[] e, int fromIndex,
boolean forward) {
MenuElement result;
if (forward) {
@@ -745,7 +745,7 @@
return result;
}
- static MenuElement findEnabledChild(MenuElement e[],
+ static MenuElement findEnabledChild(MenuElement[] e,
MenuElement elem, boolean forward) {
for (int i=0; i<e.length; i++) {
if (e[i] == elem) {
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -61,7 +61,7 @@
* @param path an array of {@code MenuElement}
* @param manager an instance of {@code MenuSelectionManager}
*/
- public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement path[],MenuSelectionManager manager) {
+ public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement[] path,MenuSelectionManager manager) {
Point p = e.getPoint();
if(p.x >= 0 && p.x < item.getWidth() &&
p.y >= 0 && p.y < item.getHeight()) {
@@ -72,7 +72,7 @@
} else
manager.setSelectedPath(path);
} else if(item.getModel().isArmed()) {
- MenuElement newPath[] = new MenuElement[path.length-1];
+ MenuElement[] newPath = new MenuElement[path.length-1];
int i,c;
for(i=0,c=path.length-1;i<c;i++)
newPath[i] = path[i];
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -216,7 +216,8 @@
JTextField tf = ((JSpinner.DefaultEditor) editor).getTextField();
if (tf != null) {
if (tf.getFont() instanceof UIResource) {
- tf.setFont(new FontUIResource(spinner.getFont()));
+ Font font = spinner.getFont();
+ tf.setFont(font == null ? null : new FontUIResource(font));
}
}
}
@@ -999,7 +1000,8 @@
((JSpinner.DefaultEditor)newEditor).getTextField();
if (tf != null) {
if (tf.getFont() instanceof UIResource) {
- tf.setFont(new FontUIResource(spinner.getFont()));
+ Font font = spinner.getFont();
+ tf.setFont(font == null ? null : new FontUIResource(font));
}
tf.addFocusListener(nextButtonHandler);
tf.addFocusListener(previousButtonHandler);
@@ -1017,7 +1019,8 @@
((JSpinner.DefaultEditor)editor).getTextField();
if (tf != null) {
if (tf.getFont() instanceof UIResource) {
- tf.setFont(new FontUIResource(spinner.getFont()));
+ Font font = spinner.getFont();
+ tf.setFont(font == null ? null : new FontUIResource(font));
}
}
}
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -132,13 +132,13 @@
// Transient variables (recalculated each time TabbedPane is layed out)
/** Tab runs */
- protected int tabRuns[] = new int[10];
+ protected int[] tabRuns = new int[10];
/** Run count */
protected int runCount = 0;
/** Selected run */
protected int selectedRun = -1;
/** Tab rects */
- protected Rectangle rects[] = new Rectangle[0];
+ protected Rectangle[] rects = new Rectangle[0];
/** Maximum tab height */
protected int maxTabHeight;
/** Maximum tab width */
@@ -986,8 +986,8 @@
* subtracting xCropLen[i] from (tab.y + tab.height) and adding yCropLen[i]
* to (tab.x).
*/
- private static int xCropLen[] = {1,1,0,0,1,1,2,2};
- private static int yCropLen[] = {0,3,3,6,6,9,9,12};
+ private static int[] xCropLen = {1,1,0,0,1,1,2,2};
+ private static int[] yCropLen = {0,3,3,6,6,9,9,12};
private static final int CROP_SEGMENT = 12;
private static Polygon createCroppedTabShape(int tabPlacement, Rectangle tabRect, int cropline) {
@@ -1017,8 +1017,8 @@
rcnt++;
}
int npts = 2 + (rcnt*8);
- int xp[] = new int[npts];
- int yp[] = new int[npts];
+ int[] xp = new int[npts];
+ int[] yp = new int[npts];
int pcnt = 0;
xp[pcnt] = ostart;
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -360,7 +360,7 @@
USER_TEXT_FONT, CONTROL_TEXT_FONT,
CONTROL_TEXT_FONT, SUB_TEXT_FONT
};
- FontUIResource fonts[];
+ FontUIResource[] fonts;
// menu and window are mapped to controlFont
public FontDelegate() {
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -224,7 +224,7 @@
Transparency.BITMASK);
}
else {
- int cmap[] = { backColor.getRGB(), topColor.getRGB(),
+ int[] cmap = { backColor.getRGB(), topColor.getRGB(),
shadowColor.getRGB() };
IndexColorModel icm = new IndexColorModel(8, 3, cmap, 0, false,
(backColor == MetalBumps.ALPHA) ? 0 : -1,
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -2226,7 +2226,7 @@
*/
private static void updateWindowUI(Window window) {
SwingUtilities.updateComponentTreeUI(window);
- Window ownedWins[] = window.getOwnedWindows();
+ Window[] ownedWins = window.getOwnedWindows();
for (Window w : ownedWins) {
updateWindowUI(w);
}
@@ -2236,7 +2236,7 @@
* Updates the UIs of all the known Frames.
*/
private static void updateAllUIs() {
- Frame appFrames[] = Frame.getFrames();
+ Frame[] appFrames = Frame.getFrames();
for (Frame frame : appFrames) {
updateWindowUI(frame);
}
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -303,7 +303,7 @@
//there are no custom states or custom state ordering
String statesString = (String)defaults.get(prefix + ".States");
if (statesString != null) {
- String s[] = statesString.split(",");
+ String[] s = statesString.split(",");
for (int i=0; i<s.length; i++) {
s[i] = s[i].trim();
if (!State.isStandardStateName(s[i])) {
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -863,7 +863,7 @@
*/
private static void updateWindowUI(Window window) {
updateStyles(window);
- Window ownedWins[] = window.getOwnedWindows();
+ Window[] ownedWins = window.getOwnedWindows();
for (Window w : ownedWins) {
updateWindowUI(w);
}
@@ -873,7 +873,7 @@
* Updates the UIs of all the known Frames.
*/
private static void updateAllUIs() {
- Frame appFrames[] = Frame.getFrames();
+ Frame[] appFrames = Frame.getFrames();
for (Frame frame : appFrames) {
updateWindowUI(frame);
}
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -1245,14 +1245,14 @@
}
}
- public void characters(char ch[], int start, int length)
+ public void characters(char[] ch, int start, int length)
throws SAXException {
if (isForwarding()) {
getHandler().characters(ch, start, length);
}
}
- public void ignorableWhitespace (char ch[], int start, int length)
+ public void ignorableWhitespace (char[] ch, int start, int length)
throws SAXException {
if (isForwarding()) {
getHandler().ignorableWhitespace(ch, start, length);
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java Wed Oct 24 13:35:18 2018 +0530
@@ -51,7 +51,7 @@
* SynthLookAndFeel.setStyleFactory(new MyStyleFactory());
* </pre>
*
- * @see SynthStyleFactory
+ * @see SynthLookAndFeel
* @see SynthStyle
*
* @since 1.5
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html Wed Oct 24 13:35:18 2018 +0530
@@ -52,7 +52,7 @@
allows for specifying all the pieces
necessary to create your own look and feel. A synth file is
loaded by way of the <A
- HREF="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.io.InputStream,%20java.lang.Class)">
+ HREF="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.io.InputStream,java.lang.Class)">
SynthLookAndFeel.load(InputStream, Class)</a> or
<a href="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.net.URL)">
SynthLookAndFeel.load(URL)</a> methods.
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1057,7 +1057,7 @@
// Calculate the bidi levels for the affected range of paragraphs. The
// levels array will contain a bidi level for each character in the
// affected text.
- byte levels[] = calculateBidiLevels( firstPStart, lastPEnd );
+ byte[] levels = calculateBidiLevels( firstPStart, lastPEnd );
Vector<Element> newElements = new Vector<Element>();
@@ -1185,7 +1185,7 @@
*/
private byte[] calculateBidiLevels( int firstPStart, int lastPEnd ) {
- byte levels[] = new byte[ lastPEnd - firstPStart ];
+ byte[] levels = new byte[ lastPEnd - firstPStart ];
int levelsEnd = 0;
Boolean defaultDirection = null;
Object d = getProperty(TextAttribute.RUN_DIRECTION);
--- a/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1002,7 +1002,7 @@
@Override
protected SizeRequirements calculateMajorAxisRequirements(int axis,
SizeRequirements r) {
- int oldJustficationData[] = justificationData;
+ int[] oldJustficationData = justificationData;
justificationData = null;
SizeRequirements ret = super.calculateMajorAxisRequirements(axis, r);
if (isJustifyEnabled()) {
@@ -1014,7 +1014,7 @@
@Override
protected void layoutMajorAxis(int targetSpan, int axis,
int[] offsets, int[] spans) {
- int oldJustficationData[] = justificationData;
+ int[] oldJustficationData = justificationData;
justificationData = null;
super.layoutMajorAxis(targetSpan, axis, offsets, spans);
if (! isJustifyEnabled()) {
@@ -1045,7 +1045,7 @@
int rowStartOffset = getStartOffset();
int rowEndOffset = getEndOffset();
- int spaceMap[] = new int[rowEndOffset - rowStartOffset];
+ int[] spaceMap = new int[rowEndOffset - rowStartOffset];
Arrays.fill(spaceMap, 0);
for (int i = getViewCount() - 1; i >= 0 ; i--) {
View view = getView(i);
@@ -1179,7 +1179,7 @@
//this should be the last index in justificationData
static final int END_JUSTIFIABLE = 3;
- int justificationData[] = null;
+ int[] justificationData = null;
}
}
--- a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -1975,7 +1975,7 @@
vec.addElement(Integer.valueOf(i));
}
}
- int retval[] = new int[vec.size()];
+ int[] retval = new int[vec.size()];
for (int i = 0; i < retval.length; i++) {
retval[i] = vec.elementAt(i).intValue();
}
@@ -2000,7 +2000,7 @@
vec.addElement(Integer.valueOf(i));
}
}
- int retval[] = new int[vec.size()];
+ int[] retval = new int[vec.size()];
for (int i = 0; i < retval.length; i++) {
retval[i] = vec.elementAt(i).intValue();
}
--- a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -3373,9 +3373,9 @@
int n = iter.getCount();
int adjustmentWeightsCount = LayoutIterator.WorstAdjustmentWeight + 1;
//max gain we can get adjusting elements with adjustmentWeight <= i
- long gain[] = new long[adjustmentWeightsCount];
+ long[] gain = new long[adjustmentWeightsCount];
//max loss we can get adjusting elements with adjustmentWeight <= i
- long loss[] = new long[adjustmentWeightsCount];
+ long[] loss = new long[adjustmentWeightsCount];
for (int i = 0; i < adjustmentWeightsCount; i++) {
gain[i] = loss[i] = 0;
@@ -3414,7 +3414,7 @@
// determine the adjustment to be made
int allocated = targetSpan - totalSpacing;
long desiredAdjustment = allocated - preferred;
- long adjustmentsArray[] = (desiredAdjustment > 0) ? gain : loss;
+ long[] adjustmentsArray = (desiredAdjustment > 0) ? gain : loss;
desiredAdjustment = Math.abs(desiredAdjustment);
int adjustmentLevel = 0;
for (;adjustmentLevel <= LayoutIterator.WorstAdjustmentWeight;
--- a/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -70,7 +70,7 @@
};
/** Parsers for the border properties. */
- static final CssValue PARSERS[] = {
+ static final CssValue[] PARSERS = {
new ColorValue(), new BorderStyle(), new BorderWidthValue(null, 0),
};
--- a/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -184,7 +184,7 @@
protected SizeRequirements[] getChildRequests(int targetSpan, int axis) {
- int span[] = new int[children.length];
+ int[] span = new int[children.length];
spread(targetSpan, span);
int n = getViewCount();
@@ -215,7 +215,7 @@
* computes this based on the information that extracted
* from the value of the ROW/COL attribute.
*/
- private void spread(int targetSpan, int span[]) {
+ private void spread(int targetSpan, int[] span) {
if (targetSpan == 0) {
return;
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTML.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTML.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -553,7 +553,7 @@
*/
public static final Tag COMMENT = new Tag("comment");
- static final Tag allTags[] = {
+ static final Tag[] allTags = {
A, ADDRESS, APPLET, AREA, B, BASE, BASEFONT, BIG,
BLOCKQUOTE, BODY, BR, CAPTION, CENTER, CITE, CODE,
DD, DFN, DIR, DIV, DL, DT, EM, FONT, FORM, FRAME,
@@ -1060,7 +1060,7 @@
public static final Attribute COMMENT = new Attribute("comment");
static final Attribute MEDIA = new Attribute("media");
- static final Attribute allAttributes[] = {
+ static final Attribute[] allAttributes = {
FACE,
COMMENT,
SIZE,
--- a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java Wed Oct 24 13:35:18 2018 +0530
@@ -776,32 +776,10 @@
if (newWidth > 0) {
newState |= WIDTH_FLAG;
- if (newHeight <= 0) {
- newHeight = newWidth;
- newState |= HEIGHT_FLAG;
- }
}
if (newHeight > 0) {
newState |= HEIGHT_FLAG;
- if (newWidth <= 0) {
- newWidth = newHeight;
- newState |= WIDTH_FLAG;
- }
- }
-
- if (newWidth <= 0) {
- newWidth = newImage.getWidth(imageObserver);
- if (newWidth <= 0) {
- newWidth = DEFAULT_WIDTH;
- }
- }
-
- if (newHeight <= 0) {
- newHeight = newImage.getHeight(imageObserver);
- if (newHeight <= 0) {
- newHeight = DEFAULT_HEIGHT;
- }
}
// Make sure the image starts loading:
@@ -965,6 +943,35 @@
changed |= 2;
}
+ /**
+ * If the image properties (height and width) have been loaded,
+ * then figure out if scaling is necessary based on the
+ * specified HTML attributes.
+ */
+ if (((flags & ImageObserver.HEIGHT) != 0) &&
+ ((flags & ImageObserver.WIDTH) != 0)) {
+ double proportion = 0.0;
+ final int specifiedWidth = getIntAttr(HTML.Attribute.WIDTH, -1);
+ final int specifiedHeight = getIntAttr(HTML.Attribute.HEIGHT, -1);
+ /**
+ * If either of the attributes are not specified, then calculate the
+ * proportion for the specified dimension wrt actual value, and then
+ * apply the same proportion to the unspecified dimension as well,
+ * so that the aspect ratio of the image is maintained.
+ */
+ if (specifiedWidth != -1 ^ specifiedHeight != -1) {
+ if (specifiedWidth <= 0) {
+ proportion = specifiedHeight / ((double)newHeight);
+ newWidth = (int)(proportion * newWidth);
+ }
+
+ if (specifiedHeight <= 0) {
+ proportion = specifiedWidth / ((double)newWidth);
+ newHeight = (int)(proportion * newHeight);
+ }
+ changed |= 3;
+ }
+ }
synchronized(ImageView.this) {
if ((changed & 1) == 1 && (state & HEIGHT_FLAG) == 0) {
height = newHeight;
--- a/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -76,7 +76,7 @@
protected synchronized void insertAttributeSetAt(AttributeSet as,
int index) {
int numAttrs = attrs.length;
- AttributeSet newAttrs[] = new AttributeSet[numAttrs + 1];
+ AttributeSet[] newAttrs = new AttributeSet[numAttrs + 1];
if (index < numAttrs) {
if (index > 0) {
System.arraycopy(attrs, 0, newAttrs, 0, index);
--- a/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -133,7 +133,7 @@
System.err.println("introspector failed, ex: "+ex);
return; // quit for now
}
- PropertyDescriptor props[] = bi.getPropertyDescriptors();
+ PropertyDescriptor[] props = bi.getPropertyDescriptors();
for (int i=0; i < props.length; i++) {
// System.err.println("checking on props[i]: "+props[i].getName());
Object v = attr.getAttribute(props[i].getName());
--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1514,9 +1514,9 @@
int numElements = elements.size();
// Build three arrays, one for tags, one for class's, and one for
// id's
- String tags[] = new String[numElements];
- String ids[] = new String[numElements];
- String classes[] = new String[numElements];
+ String[] tags = new String[numElements];
+ String[] ids = new String[numElements];
+ String[] classes = new String[numElements];
for (int counter = 0; counter < numElements; counter++) {
Element e = elements.elementAt(counter);
AttributeSet attr = e.getAttributes();
@@ -2447,7 +2447,7 @@
}
/* list of roman numerals */
- static final char romanChars[][] = {
+ static final char[][] romanChars = {
{'i', 'v'},
{'x', 'l' },
{'c', 'd' },
@@ -3410,8 +3410,8 @@
* The HTML/CSS size model has seven slots
* that one can assign sizes to.
*/
- static final int sizeMapDefault[] = { 8, 10, 12, 14, 18, 24, 36 };
+ static final int[] sizeMapDefault = { 8, 10, 12, 14, 18, 24, 36 };
- private int sizeMap[] = sizeMapDefault;
+ private int[] sizeMap = sizeMapDefault;
private boolean w3cLengthUnits = false;
}
--- a/src/java.desktop/share/classes/javax/swing/text/html/TableView.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/TableView.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -1054,7 +1054,7 @@
/**
* Set the layout arrays to use for holding layout results
*/
- public void setLayoutArrays(int offsets[], int spans[], int targetSpan) {
+ public void setLayoutArrays(int[] offsets, int[] spans, int targetSpan) {
this.offsets = offsets;
this.spans = spans;
updatePercentagesAndAdjustmentWeights(targetSpan);
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -156,8 +156,8 @@
}
}
- private boolean valSet[];
- private boolean val[];
+ private boolean[] valSet;
+ private boolean[] val;
// A cache used by first(). This cache was found to speed parsing
// by about 10% (based on measurements of the 4-12 code base after
// buffering was fixed).
@@ -264,7 +264,7 @@
case ',':
case '|':
case '&':
- char data[] = {' ', (char)type, ' '};
+ char[] data = {' ', (char)type, ' '};
String str = "";
for (ContentModel m = (ContentModel)content ; m != null ; m = m.next) {
str = str + m;
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -237,7 +237,7 @@
* @return the <code>Entity</code> requested or a new <code>Entity</code>
* if not found
*/
- public Entity defineEntity(String name, int type, char data[]) {
+ public Entity defineEntity(String name, int type, char[] data) {
Entity ent = entityHash.get(name);
if (ent == null) {
ent = new Entity(name, type, data);
@@ -304,7 +304,7 @@
* @return the new character <code>Entity</code>
*/
public Entity defEntity(String name, int type, int ch) {
- char data[] = {(char)ch};
+ char[] data = {(char)ch};
return defineEntity(name, type, data);
}
@@ -317,7 +317,7 @@
*/
protected Entity defEntity(String name, int type, String str) {
int len = str.length();
- char data[] = new char[len];
+ char[] data = new char[len];
str.getChars(0, len, data, 0);
return defineEntity(name, type, data);
}
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -177,7 +177,7 @@
}
- protected void handleComment(char text[]) {
+ protected void handleComment(char[] text) {
if (debugFlag) {
debug("comment: ->" + new String(text) + "<-"
+ " pos: " + getCurrentPos());
@@ -257,7 +257,7 @@
/**
* Handle Text.
*/
- protected void handleText(char data[]) {
+ protected void handleText(char[] data) {
if (data != null) {
if (inscript != 0) {
callback.handleComment(data, getBlockStartPosition());
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -55,7 +55,7 @@
/**
* The char array of data.
*/
- public char data[];
+ public char[] data;
/**
* Creates an entity.
@@ -63,7 +63,7 @@
* @param type the type of the entity
* @param data the char array of data
*/
- public Entity(String name, int type, char data[]) {
+ public Entity(String name, int type, char[] data) {
this.name = name;
this.type = type;
this.data = data;
@@ -105,7 +105,7 @@
* Returns the <code>data</code>.
* @return the <code>data</code>
*/
- public char getData()[] {
+ public char[] getData() {
return data;
}
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -78,12 +78,12 @@
public
class Parser implements DTDConstants {
- private char text[] = new char[1024];
+ private char[] text = new char[1024];
private int textpos = 0;
private TagElement last;
private boolean space;
- private char str[] = new char[128];
+ private char[] str = new char[128];
private int strpos = 0;
/**
@@ -273,7 +273,7 @@
*
* @param text the section text
*/
- protected void handleText(char text[]) {
+ protected void handleText(char[] text) {
}
/**
@@ -281,7 +281,7 @@
*
* @param text the title text
*/
- protected void handleTitle(char text[]) {
+ protected void handleTitle(char[] text) {
// default behavior is to call handleText. Subclasses
// can override if necessary.
handleText(text);
@@ -292,7 +292,7 @@
*
* @param text the comment being handled
*/
- protected void handleComment(char text[]) {
+ protected void handleComment(char[] text) {
}
/**
@@ -386,7 +386,7 @@
if (!ignoreSpace) {
// enlarge buffer if needed
if (textpos + 1 > text.length) {
- char newtext[] = new char[text.length + 200];
+ char[] newtext = new char[text.length + 200];
System.arraycopy(text, 0, newtext, 0, text.length);
text = newtext;
}
@@ -399,7 +399,7 @@
}
space = false;
}
- char newtext[] = new char[textpos];
+ char[] newtext = new char[textpos];
System.arraycopy(text, 0, newtext, 0, textpos);
// Handles cases of bad html where the title tag
// was getting lost when we did error recovery.
@@ -837,7 +837,7 @@
*/
void addString(int c) {
if (strpos == str.length) {
- char newstr[] = new char[str.length + 128];
+ char[] newstr = new char[str.length + 128];
System.arraycopy(str, 0, newstr, 0, str.length);
str = newstr;
}
@@ -848,21 +848,21 @@
* Get the string that's been accumulated.
*/
String getString(int pos) {
- char newStr[] = new char[strpos - pos];
+ char[] newStr = new char[strpos - pos];
System.arraycopy(str, pos, newStr, 0, strpos - pos);
strpos = pos;
return new String(newStr);
}
char[] getChars(int pos) {
- char newStr[] = new char[strpos - pos];
+ char[] newStr = new char[strpos - pos];
System.arraycopy(str, pos, newStr, 0, strpos - pos);
strpos = pos;
return newStr;
}
char[] getChars(int pos, int endPos) {
- char newStr[] = new char[endPos - pos];
+ char[] newStr = new char[endPos - pos];
System.arraycopy(str, pos, newStr, 0, endPos - pos);
// REMIND: it's not clear whether this version should set strpos or not
// strpos = pos;
@@ -1034,18 +1034,18 @@
ch = readCh();
break;
}
- char data[] = mapNumericReference(n);
+ char[] data = mapNumericReference(n);
return data;
}
addString('#');
if (!parseIdentifier(false)) {
error("ident.expected");
strpos = pos;
- char data[] = {'&', '#'};
+ char[] data = {'&', '#'};
return data;
}
} else if (!parseIdentifier(false)) {
- char data[] = {'&'};
+ char[] data = {'&'};
return data;
}
@@ -1095,7 +1095,7 @@
/* given that there is not a match restore the entity reference */
String str = "&" + nm + (semicolon ? ";" : "");
- char b[] = new char[str.length()];
+ char[] b = new char[str.length()];
str.getChars(0, b.length, b, 0);
return b;
}
@@ -1251,9 +1251,9 @@
break;
case '&':
- char data[] = parseEntityReference();
+ char[] data = parseEntityReference();
if (textpos + data.length > text.length) {
- char newtext[] = new char[Math.max(textpos + data.length + 128, text.length * 2)];
+ char[] newtext = new char[Math.max(textpos + data.length + 128, text.length * 2)];
System.arraycopy(text, 0, newtext, 0, text.length);
text = newtext;
}
@@ -1285,7 +1285,7 @@
// output character
if (textpos == text.length) {
- char newtext[] = new char[text.length + 128];
+ char[] newtext = new char[text.length + 128];
System.arraycopy(text, 0, newtext, 0, text.length);
text = newtext;
}
@@ -1395,7 +1395,7 @@
break;
}
- char data[] = parseEntityReference();
+ char[] data = parseEntityReference();
for (int i = 0 ; i < data.length ; i++) {
c = data[i];
addString((lower && (c >= 'A') && (c <= 'Z')) ? 'a' + c - 'A' : c);
@@ -1506,7 +1506,7 @@
}
}
} else {
- char str[] = {(char)ch};
+ char[] str = {(char)ch};
error("invalid.tagchar", new String(str), elem.getName());
ch = readCh();
continue;
@@ -1526,7 +1526,7 @@
error("attvalerr");
return;
} else {
- char str[] = {(char)ch};
+ char[] str = {(char)ch};
error("invalid.tagchar", new String(str), elem.getName());
if (!strict) {
ch = readCh();
@@ -1674,7 +1674,7 @@
// before parsing and sending the
// comment
if (textpos != 0) {
- char newtext[] = new char[textpos];
+ char[] newtext = new char[textpos];
System.arraycopy(text, 0, newtext, 0, textpos);
handleText(newtext);
lastBlockStartPos = currentBlockStartPos;
@@ -2224,9 +2224,9 @@
space = false;
}
}
- char data[] = parseEntityReference();
+ char[] data = parseEntityReference();
if (textpos + data.length + 1 > text.length) {
- char newtext[] = new char[Math.max(textpos + data.length + 128, text.length * 2)];
+ char[] newtext = new char[Math.max(textpos + data.length + 128, text.length * 2)];
System.arraycopy(text, 0, newtext, 0, text.length);
text = newtext;
}
@@ -2306,7 +2306,7 @@
// enlarge buffer if needed
if (textpos + 2 > text.length) {
- char newtext[] = new char[text.length + 128];
+ char[] newtext = new char[text.length + 128];
System.arraycopy(text, 0, newtext, 0, text.length);
text = newtext;
}
@@ -2412,7 +2412,7 @@
* this reason the initial size is 1 and when the body is encountered the
* size is adjusted to 256.
*/
- private char buf[] = new char[1];
+ private char[] buf = new char[1];
private int pos;
private int len;
/*
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -49,17 +49,17 @@
abstract class AbstractFilter extends OutputStream
{
/** A table mapping bytes to characters */
- protected char translationTable[];
+ protected char[] translationTable;
/** A table indicating which byte values should be interpreted as
* characters and which should be treated as formatting codes */
- protected boolean specialsTable[];
+ protected boolean[] specialsTable;
/** A translation table which does ISO Latin-1 (trivial) */
- static final char latin1TranslationTable[];
+ static final char[] latin1TranslationTable;
/** A specials table which indicates that no characters are special */
- static final boolean noSpecialsTable[];
+ static final boolean[] noSpecialsTable;
/** A specials table which indicates that all characters are special */
- static final boolean allSpecialsTable[];
+ static final boolean[] allSpecialsTable;
static {
int i;
@@ -93,7 +93,7 @@
public void readFromStream(InputStream in)
throws IOException
{
- byte buf[];
+ byte[] buf;
int count;
buf = new byte[16384];
@@ -110,7 +110,7 @@
public void readFromReader(Reader in)
throws IOException
{
- char buf[];
+ char[] buf;
int count;
buf = new char[2048];
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -33,7 +33,7 @@
class RTFAttributes
{
- static RTFAttribute attributes[];
+ static RTFAttribute[] attributes;
static {
Vector<RTFAttribute> a = new Vector<RTFAttribute>();
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -496,7 +496,7 @@
protected void checkControlWords(MutableAttributeSet currentAttributes,
AttributeSet newAttributes,
- RTFAttribute words[],
+ RTFAttribute[] words,
int domain)
throws IOException
{
@@ -596,7 +596,7 @@
RTFAttributes.attributes, RTFAttribute.D_PARAGRAPH);
if (oldTabs != newTabs && newTabs != null) {
- TabStop tabs[] = (TabStop[])newTabs;
+ TabStop[] tabs = (TabStop[])newTabs;
int index;
for(index = 0; index < tabs.length; index ++) {
TabStop tab = tabs[index];
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -90,7 +90,7 @@
public abstract void endgroup();
// table of non-text characters in rtf
- static final boolean rtfSpecialsTable[];
+ static final boolean[] rtfSpecialsTable;
static {
rtfSpecialsTable = noSpecialsTable.clone();
rtfSpecialsTable['\n'] = true;
@@ -191,7 +191,7 @@
break;
}
if (!Character.isLetter(ch)) {
- char newstring[] = new char[1];
+ char[] newstring = new char[1];
newstring[0] = ch;
if (!handleKeyword(new String(newstring))) {
warning("Unknown keyword: " + newstring + " (" + (byte)ch + ")");
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1421,7 +1421,7 @@
Integer stateItem;
/*** Tab stops ***/
- TabStop tabs[];
+ TabStop[] tabs;
tabs = (TabStop[])parserState.get("_tabs_immutable");
if (tabs == null) {
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -382,7 +382,7 @@
}
if(validCount > 0) {
- TreePath newSelection[] = new TreePath[oldCount +
+ TreePath[] newSelection = new TreePath[oldCount +
validCount];
/* And build the new selection. */
@@ -901,7 +901,7 @@
}
else {
TreePath[] newSel = new TreePath[counter - min];
- int selectionIndex[] = rowMapper.getRowsForPaths(selection);
+ int[] selectionIndex = rowMapper.getRowsForPaths(selection);
// find the actual selection pathes corresponded to the
// rows of the new selection
for (int i = 0; i < selectionIndex.length; i++) {
--- a/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -347,7 +347,7 @@
*/
public void treeNodesChanged(TreeModelEvent e) {
if(e != null) {
- int changedIndexs[];
+ int[] changedIndexs;
FHTreeStateNode changedParent = getNodeForPath
(SwingUtilities2.getTreePath(e, getModel()), false, false);
int maxCounter;
@@ -391,7 +391,7 @@
*/
public void treeNodesInserted(TreeModelEvent e) {
if(e != null) {
- int changedIndexs[];
+ int[] changedIndexs;
FHTreeStateNode changedParent = getNodeForPath
(SwingUtilities2.getTreePath(e, getModel()), false, false);
int maxCounter;
@@ -430,7 +430,7 @@
*/
public void treeNodesRemoved(TreeModelEvent e) {
if(e != null) {
- int changedIndexs[];
+ int[] changedIndexs;
int maxCounter;
TreePath parentPath = SwingUtilities2.getTreePath(e, getModel());
FHTreeStateNode changedParentNode = getNodeForPath
--- a/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -409,7 +409,7 @@
*/
public void treeNodesChanged(TreeModelEvent e) {
if(e != null) {
- int changedIndexs[] = e.getChildIndices();
+ int[] changedIndexs = e.getChildIndices();
TreeStateNode changedNode = getNodeForPath(
SwingUtilities2.getTreePath(e, getModel()), false, false);
@@ -456,7 +456,7 @@
*/
public void treeNodesInserted(TreeModelEvent e) {
if(e != null) {
- int changedIndexs[] = e.getChildIndices();
+ int[] changedIndexs = e.getChildIndices();
TreeStateNode changedParentNode = getNodeForPath(
SwingUtilities2.getTreePath(e, getModel()), false, false);
/* Only need to update the children if the node has been
@@ -522,7 +522,7 @@
*/
public void treeNodesRemoved(TreeModelEvent e) {
if(e != null) {
- int changedIndexs[];
+ int[] changedIndexs;
TreeStateNode changedParentNode;
changedIndexs = e.getChildIndices();
--- a/src/java.desktop/share/classes/sun/awt/AWTAccessor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java Wed Oct 24 13:35:18 2018 +0530
@@ -565,7 +565,7 @@
/*
* Sets the files the user selects
*/
- void setFiles(FileDialog fileDialog, File files[]);
+ void setFiles(FileDialog fileDialog, File[] files);
/*
* Sets the file the user selects
--- a/src/java.desktop/share/classes/sun/awt/CharsetString.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/CharsetString.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -48,7 +48,7 @@
/**
* Creates a new CharsetString
*/
- public CharsetString(char charsetChars[], int offset, int length,
+ public CharsetString(char[] charsetChars, int offset, int length,
FontDescriptor fontDescriptor){
this.charsetChars = charsetChars;
--- a/src/java.desktop/share/classes/sun/awt/DebugSettings.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/DebugSettings.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -79,7 +79,7 @@
static final String PROP_FILE = "properties";
/* default property settings */
- private static final String DEFAULT_PROPS[] = {
+ private static final String[] DEFAULT_PROPS = {
"awtdebug.assert=true",
"awtdebug.trace=false",
"awtdebug.on=true",
--- a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -1606,7 +1606,7 @@
}
}
- private static boolean contains(short IDs[], short id, int limit) {
+ private static boolean contains(short[] IDs, short id, int limit) {
for (int i = 0; i < limit; i++) {
if (IDs[i] == id) {
return true;
@@ -1758,7 +1758,7 @@
return (short)(stringIDNum - 1);
}
- private static short getShortArrayID(short sa[]) {
+ private static short getShortArrayID(short[] sa) {
char[] cc = new char[sa.length];
for (int i = 0; i < sa.length; i ++) {
cc[i] = (char)sa[i];
--- a/src/java.desktop/share/classes/sun/awt/IconInfo.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/IconInfo.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -119,7 +119,7 @@
* returns scaled raw length.
*/
private int getScaledRawLength(int w, int h) {
- int scaledWidthAndHeight[] = getScaledWidthAndHeight(w, h);
+ int[] scaledWidthAndHeight = getScaledWidthAndHeight(w, h);
return scaledWidthAndHeight[0] * scaledWidthAndHeight[1] + 2;
}
@@ -237,7 +237,7 @@
new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), 32,
0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000,
false, DataBuffer.TYPE_INT);
- int scaledWidthAndHeight[] = getScaledWidthAndHeight(width, height);
+ int[] scaledWidthAndHeight = getScaledWidthAndHeight(width, height);
width = scaledWidthAndHeight[0];
height = scaledWidthAndHeight[1];
DataBufferInt buffer = new DataBufferInt(width * height);
--- a/src/java.desktop/share/classes/sun/awt/PlatformFont.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/PlatformFont.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -120,7 +120,7 @@
* @param offset offset of first character of interest
* @param len number of characters to convert
*/
- public CharsetString[] makeMultiCharsetString(char str[], int offset, int len) {
+ public CharsetString[] makeMultiCharsetString(char[] str, int offset, int len) {
return makeMultiCharsetString(str, offset, len, true);
}
@@ -137,7 +137,7 @@
* then return null.
* This is used to choose alternative means of displaying the text.
*/
- public CharsetString[] makeMultiCharsetString(char str[], int offset, int len,
+ public CharsetString[] makeMultiCharsetString(char[] str, int offset, int len,
boolean allowDefault) {
if (len < 1) {
--- a/src/java.desktop/share/classes/sun/awt/RepaintArea.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/RepaintArea.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -55,7 +55,7 @@
private static final int RECT_COUNT = UPDATE + 1;
- private Rectangle paintRects[] = new Rectangle[RECT_COUNT];
+ private Rectangle[] paintRects = new Rectangle[RECT_COUNT];
/**
--- a/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/TracedEventQueue.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -49,7 +49,7 @@
static boolean trace = false;
// The list of event IDs to ignore when tracing.
- static int suppressedIDs[] = null;
+ static int[] suppressedIDs = null;
static {
String s = Toolkit.getProperty("AWT.IgnoreEventIDs", "");
--- a/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -1152,7 +1152,7 @@
try (ByteArrayInputStream str = new ByteArrayInputStream(bytes)) {
- URI uris[] = dragQueryURIs(str, format, localeTransferable);
+ URI[] uris = dragQueryURIs(str, format, localeTransferable);
if (uris == null) {
return null;
}
@@ -1295,7 +1295,7 @@
&& DataFlavor.javaFileListFlavor.equals(flavor))
{
- URI uris[] = dragQueryURIs(str, format, localeTransferable);
+ URI[] uris = dragQueryURIs(str, format, localeTransferable);
if (uris == null) {
return null;
}
--- a/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/AreaOp.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -214,7 +214,7 @@
int right = 0;
int cur = 0;
int next = 0;
- double yrange[] = new double[2];
+ double[] yrange = new double[2];
Vector<CurveLink> subcurves = new Vector<>();
Vector<ChainEnd> chains = new Vector<>();
Vector<CurveLink> links = new Vector<>();
--- a/src/java.desktop/share/classes/sun/awt/geom/Crossings.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/Crossings.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -33,7 +33,7 @@
public static final boolean debug = false;
int limit = 0;
- double yranges[] = new double[10];
+ double[] yranges = new double[10];
double xlo, ylo, xhi, yhi;
@@ -119,7 +119,7 @@
// 0-2 horizontal splitting parameters
// OR
// 3 parametric equation derivative coefficients
- double coords[] = new double[23];
+ double[] coords = new double[23];
double movx = 0;
double movy = 0;
double curx = 0;
@@ -239,7 +239,7 @@
private Vector<Curve> tmp = new Vector<>();
- public boolean accumulateQuad(double x0, double y0, double coords[]) {
+ public boolean accumulateQuad(double x0, double y0, double[] coords) {
if (y0 < ylo && coords[1] < ylo && coords[3] < ylo) {
return false;
}
@@ -269,7 +269,7 @@
return false;
}
- public boolean accumulateCubic(double x0, double y0, double coords[]) {
+ public boolean accumulateCubic(double x0, double y0, double[] coords) {
if (y0 < ylo && coords[1] < ylo &&
coords[3] < ylo && coords[5] < ylo)
{
@@ -379,7 +379,7 @@
to += (limit-from);
if (ystart < yend) {
if (to >= yranges.length) {
- double newranges[] = new double[to+10];
+ double[] newranges = new double[to+10];
System.arraycopy(yranges, 0, newranges, 0, to);
yranges = newranges;
}
@@ -391,7 +391,7 @@
}
public static final class NonZero extends Crossings {
- private int crosscounts[];
+ private int[] crosscounts;
public NonZero(double xlo, double ylo, double xhi, double yhi) {
super(xlo, ylo, xhi, yhi);
@@ -430,8 +430,8 @@
public void insert(int cur, double lo, double hi, int dir) {
int rem = limit - cur;
- double oldranges[] = yranges;
- int oldcounts[] = crosscounts;
+ double[] oldranges = yranges;
+ int[] oldcounts = crosscounts;
if (limit >= yranges.length) {
yranges = new double[limit+10];
System.arraycopy(oldranges, 0, yranges, 0, cur);
--- a/src/java.desktop/share/classes/sun/awt/geom/Curve.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/Curve.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -61,7 +61,7 @@
public static void insertQuad(Vector<Curve> curves,
double x0, double y0,
- double coords[])
+ double[] coords)
{
double y1 = coords[3];
if (y0 > y1) {
@@ -84,7 +84,7 @@
public static void insertCubic(Vector<Curve> curves,
double x0, double y0,
- double coords[])
+ double[] coords)
{
double y1 = coords[5];
if (y0 > y1) {
@@ -127,7 +127,7 @@
if (pi.isDone()) {
return 0;
}
- double coords[] = new double[6];
+ double[] coords = new double[6];
if (pi.currentSegment(coords) != PathIterator.SEG_MOVETO) {
throw new IllegalPathStateException("missing initial moveto "+
"in path definition");
@@ -384,7 +384,7 @@
if (pi.isDone()) {
return 0;
}
- double coords[] = new double[6];
+ double[] coords = new double[6];
if (pi.currentSegment(coords) != PathIterator.SEG_MOVETO) {
throw new IllegalPathStateException("missing initial moveto "+
"in path definition");
@@ -866,7 +866,7 @@
public abstract Curve getReversedCurve();
public abstract Curve getSubCurve(double ystart, double yend, int dir);
- public int compareTo(Curve that, double yrange[]) {
+ public int compareTo(Curve that, double[] yrange) {
/*
System.out.println(this+".compareTo("+that+")");
System.out.println("target range = "+yrange[0]+"=>"+yrange[1]);
@@ -1030,7 +1030,7 @@
public static final double TMIN = 1E-3;
- public boolean findIntersect(Curve that, double yrange[], double ymin,
+ public boolean findIntersect(Curve that, double[] yrange, double ymin,
int slevel, int tlevel,
double s0, double xs0, double ys0,
double s1, double xs1, double ys1,
@@ -1202,5 +1202,5 @@
Math.max(Math.abs(v1), Math.abs(v2)) * 1E-10);
}
- public abstract int getSegment(double coords[]);
+ public abstract int getSegment(double[] coords);
}
--- a/src/java.desktop/share/classes/sun/awt/geom/Edge.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/Edge.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -73,7 +73,7 @@
private int lastResult;
private double lastLimit;
- public int compareTo(Edge other, double yrange[]) {
+ public int compareTo(Edge other, double[] yrange) {
if (other == lastEdge && yrange[0] < lastLimit) {
if (yrange[1] > lastLimit) {
yrange[1] = lastLimit;
--- a/src/java.desktop/share/classes/sun/awt/geom/Order0.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/Order0.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -134,7 +134,7 @@
return this;
}
- public int getSegment(double coords[]) {
+ public int getSegment(double[] coords) {
coords[0] = x;
coords[1] = y;
return PathIterator.SEG_MOVETO;
--- a/src/java.desktop/share/classes/sun/awt/geom/Order1.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/Order1.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -216,7 +216,7 @@
return new Order1(x0, y0, x1, y1, -direction);
}
- public int compareTo(Curve other, double yrange[]) {
+ public int compareTo(Curve other, double[] yrange) {
if (!(other instanceof Order1)) {
return super.compareTo(other, yrange);
}
@@ -299,7 +299,7 @@
return orderof(XforY(y), c1.XforY(y));
}
- public int getSegment(double coords[]) {
+ public int getSegment(double[] coords) {
if (direction == INCREASING) {
coords[0] = x1;
coords[1] = y1;
--- a/src/java.desktop/share/classes/sun/awt/geom/Order2.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/Order2.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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,7 +47,7 @@
private double ycoeff1;
private double ycoeff2;
- public static void insert(Vector<Curve> curves, double tmp[],
+ public static void insert(Vector<Curve> curves, double[] tmp,
double x0, double y0,
double cx0, double cy0,
double x1, double y1,
@@ -109,7 +109,7 @@
* means outside of this method.
*/
public static int getHorizontalParams(double c0, double cp, double c1,
- double ret[]) {
+ double[] ret) {
if (c0 <= cp && cp <= c1) {
return 0;
}
@@ -135,7 +135,7 @@
* parametric subranges [0..t] and [t..1]. Store the results back
* into the array at coords[pos...pos+5] and coords[pos+4...pos+9].
*/
- public static void split(double coords[], int pos, double t) {
+ public static void split(double[] coords, int pos, double t) {
double x0, y0, cx, cy, x1, y1;
coords[pos+8] = x1 = coords[pos+4];
coords[pos+9] = y1 = coords[pos+5];
@@ -407,7 +407,7 @@
} else {
t1 = TforY(yend, ycoeff0, ycoeff1, ycoeff2);
}
- double eqn[] = new double[10];
+ double[] eqn = new double[10];
eqn[0] = x0;
eqn[1] = y0;
eqn[2] = cx0;
@@ -434,7 +434,7 @@
return new Order2(x0, y0, cx0, cy0, x1, y1, -direction);
}
- public int getSegment(double coords[]) {
+ public int getSegment(double[] coords) {
coords[0] = cx0;
coords[1] = cy0;
if (direction == INCREASING) {
--- a/src/java.desktop/share/classes/sun/awt/geom/Order3.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/geom/Order3.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -53,7 +53,7 @@
private double ycoeff2;
private double ycoeff3;
- public static void insert(Vector<Curve> curves, double tmp[],
+ public static void insert(Vector<Curve> curves, double[] tmp,
double x0, double y0,
double cx0, double cy0,
double cx1, double cy1,
@@ -160,7 +160,7 @@
*/
public static int getHorizontalParams(double c0, double cp0,
double cp1, double c1,
- double ret[]) {
+ double[] ret) {
if (c0 <= cp0 && cp0 <= cp1 && cp1 <= c1) {
return 0;
}
@@ -191,7 +191,7 @@
* parametric subranges [0..t] and [t..1]. Store the results back
* into the array at coords[pos...pos+7] and coords[pos+6...pos+13].
*/
- public static void split(double coords[], int pos, double t) {
+ public static void split(double[] coords, int pos, double t) {
double x0, y0, cx0, cy0, cx1, cy1, x1, y1;
coords[pos+12] = x1 = coords[pos+6];
coords[pos+13] = y1 = coords[pos+7];
@@ -529,7 +529,7 @@
}
public double nextVertical(double t0, double t1) {
- double eqn[] = {xcoeff1, 2 * xcoeff2, 3 * xcoeff3};
+ double[] eqn = {xcoeff1, 2 * xcoeff2, 3 * xcoeff3};
int numroots = QuadCurve2D.solveQuadratic(eqn, eqn);
for (int i = 0; i < numroots; i++) {
if (eqn[i] > t0 && eqn[i] < t1) {
@@ -541,7 +541,7 @@
public void enlarge(Rectangle2D r) {
r.add(x0, y0);
- double eqn[] = {xcoeff1, 2 * xcoeff2, 3 * xcoeff3};
+ double[] eqn = {xcoeff1, 2 * xcoeff2, 3 * xcoeff3};
int numroots = QuadCurve2D.solveQuadratic(eqn, eqn);
for (int i = 0; i < numroots; i++) {
double t = eqn[i];
@@ -556,7 +556,7 @@
if (ystart <= y0 && yend >= y1) {
return getWithDirection(dir);
}
- double eqn[] = new double[14];
+ double[] eqn = new double[14];
double t0, t1;
t0 = TforY(ystart);
t1 = TforY(yend);
@@ -608,7 +608,7 @@
return new Order3(x0, y0, cx0, cy0, cx1, cy1, x1, y1, -direction);
}
- public int getSegment(double coords[]) {
+ public int getSegment(double[] coords) {
if (direction == INCREASING) {
coords[0] = cx0;
coords[1] = cy0;
--- a/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java Wed Oct 24 13:35:18 2018 +0530
@@ -398,8 +398,8 @@
}
private static final int CACHE_SIZE = 5;
- private static RenderLoops loopcache[] = new RenderLoops[CACHE_SIZE];
- private static SurfaceType typecache[] = new SurfaceType[CACHE_SIZE];
+ private static RenderLoops[] loopcache = new RenderLoops[CACHE_SIZE];
+ private static SurfaceType[] typecache = new SurfaceType[CACHE_SIZE];
public static synchronized RenderLoops getSolidLoops(SurfaceType type) {
for (int i = CACHE_SIZE - 1; i >= 0; i--) {
SurfaceType t = typecache[i];
--- a/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -45,9 +45,9 @@
extends GraphicsConfiguration
{
private static final int numconfigs = BufferedImage.TYPE_BYTE_BINARY;
- private static BufferedImageGraphicsConfig standardConfigs[] =
+ private static BufferedImageGraphicsConfig[] standardConfigs =
new BufferedImageGraphicsConfig[numconfigs];
- private static BufferedImageGraphicsConfig scaledConfigs[] =
+ private static BufferedImageGraphicsConfig[] scaledConfigs =
new BufferedImageGraphicsConfig[numconfigs];
public static BufferedImageGraphicsConfig getConfig(BufferedImage bImg) {
--- a/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -136,9 +136,9 @@
if (sampleModel instanceof BandedSampleModel) {
BandedSampleModel bsm = (BandedSampleModel)sampleModel;
this.scanlineStride = bsm.getScanlineStride();
- int bankIndices[] = bsm.getBankIndices();
- int bandOffsets[] = bsm.getBandOffsets();
- int dOffsets[] = dataBuffer.getOffsets();
+ int[] bankIndices = bsm.getBankIndices();
+ int[] bandOffsets = bsm.getBandOffsets();
+ int[] dOffsets = dataBuffer.getOffsets();
dataOffsets = new int[bankIndices.length];
data = new byte[bankIndices.length][];
int xOffset = aRegion.x - origin.x;
@@ -228,7 +228,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte outData[];
+ byte[] outData;
if (obj == null) {
outData = new byte[numDataElements];
} else {
@@ -275,7 +275,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte outData[];
+ byte[] outData;
if (obj == null) {
outData = new byte[numDataElements*w*h];
} else {
@@ -415,7 +415,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte inData[] = (byte[])obj;
+ byte[] inData = (byte[])obj;
int off = (y-minY)*scanlineStride + (x-minX);
for (int i = 0; i < numDataElements; i++) {
data[i][dataOffsets[i] + off] = inData[i];
@@ -509,7 +509,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte inData[] = (byte[])obj;
+ byte[] inData = (byte[])obj;
int yoff = (y-minY)*scanlineStride + (x-minX);
for (int c = 0; c < numDataElements; c++) {
@@ -639,7 +639,7 @@
public WritableRaster createWritableChild (int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
if (x < this.minX) {
throw new RasterFormatException("x lies outside raster");
@@ -694,7 +694,7 @@
public Raster createChild (int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
return createWritableChild(x, y, width, height, x0, y0, bandList);
}
--- a/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -261,7 +261,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte outData[];
+ byte[] outData;
if (obj == null) {
outData = new byte[numDataElements];
} else {
@@ -309,7 +309,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte outData[];
+ byte[] outData;
if (obj == null) {
outData = new byte[w*h*numDataElements];
} else {
@@ -463,7 +463,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte inData[] = (byte[])obj;
+ byte[] inData = (byte[])obj;
int off = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
@@ -583,7 +583,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte inData[] = (byte[])obj;
+ byte[] inData = (byte[])obj;
int yoff = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
int xoff;
--- a/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -313,7 +313,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte outData[];
+ byte[] outData;
if (obj == null) {
outData = new byte[numDataElements];
} else {
@@ -541,7 +541,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte inData[] = (byte[])obj;
+ byte[] inData = (byte[])obj;
int off = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
@@ -871,7 +871,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int samples[];
+ int[] samples;
if (iArray != null) {
samples = iArray;
} else {
@@ -909,7 +909,7 @@
return samples;
}
- public void setSamples(int x, int y, int w, int h, int b, int iArray[]) {
+ public void setSamples(int x, int y, int w, int h, int b, int[] iArray) {
if ((x < this.minX) || (y < this.minY) ||
(x + w > this.maxX) || (y + h > this.maxY)) {
throw new ArrayIndexOutOfBoundsException
@@ -954,7 +954,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int pixels[];
+ int[] pixels;
if (iArray != null) {
pixels = iArray;
} else {
--- a/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -244,7 +244,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte outData[];
+ byte[] outData;
if (obj == null) {
outData = new byte[numDataElements];
} else {
@@ -318,7 +318,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte outData[];
+ byte[] outData;
if (obj == null) {
outData = new byte[numDataElements*w*h];
} else {
@@ -328,7 +328,7 @@
int scanbit = dataBitOffset + (x-minX) * pixbits;
int index = (y-minY) * scanlineStride;
int outindex = 0;
- byte data[] = this.data;
+ byte[] data = this.data;
for (int j = 0; j < h; j++) {
int bitnum = scanbit;
@@ -399,7 +399,7 @@
int scanbit = dataBitOffset + (x-minX) * pixbits;
int index = (y-minY) * scanlineStride;
int outindex = 0;
- byte data[] = this.data;
+ byte[] data = this.data;
for (int j = 0; j < h; j++) {
int bitnum = scanbit;
@@ -506,7 +506,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- byte inData[] = (byte[])obj;
+ byte[] inData = (byte[])obj;
int bitnum = dataBitOffset + (x-minX) * pixelBitStride;
int index = (y-minY) * scanlineStride + (bitnum >> 3);
int shift = shiftOffset - (bitnum & 7);
@@ -917,7 +917,7 @@
int scanbit = dataBitOffset + (x - minX) * pixbits;
int index = (y - minY) * scanlineStride;
int outindex = 0;
- byte data[] = this.data;
+ byte[] data = this.data;
for (int j = 0; j < h; j++) {
int bitnum = scanbit;
int element;
@@ -1025,7 +1025,7 @@
* @param iArray An optionally pre-allocated int array
* @return the samples for the specified rectangle of pixels.
*/
- public int[] getPixels(int x, int y, int w, int h, int iArray[]) {
+ public int[] getPixels(int x, int y, int w, int h, int[] iArray) {
if ((x < this.minX) || (y < this.minY) ||
(x + w > this.maxX) || (y + h > this.maxY)) {
throw new ArrayIndexOutOfBoundsException
@@ -1038,7 +1038,7 @@
int scanbit = dataBitOffset + (x-minX) * pixbits;
int index = (y-minY) * scanlineStride;
int outindex = 0;
- byte data[] = this.data;
+ byte[] data = this.data;
for (int j = 0; j < h; j++) {
int bitnum = scanbit;
@@ -1138,7 +1138,7 @@
* @param h Height of the pixel rectangle.
* @param iArray The input int pixel array.
*/
- public void setPixels(int x, int y, int w, int h, int iArray[]) {
+ public void setPixels(int x, int y, int w, int h, int[] iArray) {
if ((x < this.minX) || (y < this.minY) ||
(x + w > this.maxX) || (y + h > this.maxY)) {
throw new ArrayIndexOutOfBoundsException
@@ -1148,7 +1148,7 @@
int scanbit = dataBitOffset + (x - minX) * pixbits;
int index = (y - minY) * scanlineStride;
int outindex = 0;
- byte data[] = this.data;
+ byte[] data = this.data;
for (int j = 0; j < h; j++) {
int bitnum = scanbit;
int element;
--- a/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -86,7 +86,7 @@
* Read a number of bytes into a buffer.
* @return number of bytes that were not read due to EOF or error
*/
- private int readBytes(byte buf[], int off, int len) {
+ private int readBytes(byte[] buf, int off, int len) {
while (len > 0) {
try {
int n = input.read(buf, off, len);
@@ -102,11 +102,11 @@
return len;
}
- private static final int ExtractByte(byte buf[], int off) {
+ private static final int ExtractByte(byte[] buf, int off) {
return (buf[off] & 0xFF);
}
- private static final int ExtractWord(byte buf[], int off) {
+ private static final int ExtractWord(byte[] buf, int off) {
return (buf[off] & 0xFF) | ((buf[off + 1] & 0xFF) << 8);
}
@@ -133,7 +133,7 @@
case EXBLOCK:
switch (code = input.read()) {
case EX_GRAPHICS_CONTROL: {
- byte buf[] = new byte[6];
+ byte[] buf = new byte[6];
if (readBytes(buf, 0, 6) != 0) {
return;//error("corrupt GIF file");
}
@@ -165,7 +165,7 @@
if (n <= 0) {
break;
}
- byte buf[] = new byte[n];
+ byte[] buf = new byte[n];
if (readBytes(buf, 0, n) != 0) {
return;//error("corrupt GIF file");
}
@@ -275,7 +275,7 @@
*/
private void readHeader() throws IOException, ImageFormatException {
// Create a buffer
- byte buf[] = new byte[13];
+ byte[] buf = new byte[13];
// Read the header
if (readBytes(buf, 0, 13) != 0) {
@@ -339,9 +339,9 @@
ImageConsumer.RANDOMPIXELORDER | ImageConsumer.COMPLETESCANLINES |
ImageConsumer.SINGLEPASS | ImageConsumer.SINGLEFRAME;
- private short prefix[] = new short[4096];
- private byte suffix[] = new byte[4096];
- private byte outCode[] = new byte[4097];
+ private short[] prefix = new short[4096];
+ private byte[] suffix = new byte[4096];
+ private byte[] outCode = new byte[4097];
private static native void initIDs();
@@ -353,11 +353,11 @@
private native boolean parseImage(int x, int y, int width, int height,
boolean interlace, int initCodeSize,
- byte block[], byte rasline[],
+ byte[] block, byte[] rasline,
IndexColorModel model);
private int sendPixels(int x, int y, int width, int height,
- byte rasline[], ColorModel model) {
+ byte[] rasline, ColorModel model) {
int rasbeg, rasend, x2;
if (y < 0) {
height += y;
@@ -467,7 +467,7 @@
}
// Allocate the buffer
- byte block[] = new byte[256 + 3];
+ byte[] block = new byte[256 + 3];
// Read the image descriptor
if (readBytes(block, 0, 10) != 0) {
@@ -557,7 +557,7 @@
if ((height < global_height) && (model != null)) {
byte tpix = (byte)model.getTransparentPixel();
if (tpix >= 0) {
- byte trans_rasline[] = new byte[global_width];
+ byte[] trans_rasline = new byte[global_width];
for (int i=0; i<global_width;i++) {
trans_rasline[i] = tpix;
}
@@ -579,7 +579,7 @@
x, y, width, height);
// allocate the raster data
- byte rasline[] = new byte[width];
+ byte[] rasline = new byte[width];
if (verbose) {
System.out.print("Reading a " + width + " by " + height + " " +
--- a/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -118,7 +118,7 @@
}
protected int setPixels(int x, int y, int w, int h, ColorModel model,
- byte pix[], int off, int scansize) {
+ byte[] pix, int off, int scansize) {
source.latchConsumers(this);
ImageConsumerQueue cq = null;
int count = 0;
@@ -130,7 +130,7 @@
}
protected int setPixels(int x, int y, int w, int h, ColorModel model,
- int pix[], int off, int scansize) {
+ int[] pix, int off, int scansize) {
source.latchConsumers(this);
ImageConsumerQueue cq = null;
int count = 0;
--- a/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -284,7 +284,7 @@
DataBufferInt dbi = new DataBufferInt(size);
// Note that stealData() requires a markDirty() afterwards
// since we modify the data in it.
- int newpixels[] = SunWritableRaster.stealData(dbi, 0);
+ int[] newpixels = SunWritableRaster.stealData(dbi, 0);
if (cmodel instanceof IndexColorModel &&
biRaster instanceof ByteComponentRaster &&
biRaster.getNumDataElements() == 1)
@@ -312,7 +312,7 @@
isSameCM = false;
cmodel = ColorModel.getRGBdefault();
- int bandMasks[] = {0x00ff0000,
+ int[] bandMasks = {0x00ff0000,
0x0000ff00,
0x000000ff,
0xff000000};
@@ -344,7 +344,7 @@
public void setPixels(int x, int y, int w, int h,
ColorModel model,
- byte pix[], int off, int scansize) {
+ byte[] pix, int off, int scansize) {
int lineOff=off;
int poff;
int[] newLUT=null;
@@ -541,7 +541,7 @@
public void setPixels(int x, int y, int w, int h, ColorModel model,
- int pix[], int off, int scansize)
+ int[] pix, int off, int scansize)
{
int lineOff=off;
int poff;
@@ -662,7 +662,7 @@
0x0000ff00,
0x000000ff);
- int bandmasks[] = {0x00ff0000, 0x0000ff00, 0x000000ff};
+ int[] bandmasks = {0x00ff0000, 0x0000ff00, 0x000000ff};
WritableRaster opRaster = Raster.createPackedRaster(db, w, h, w,
bandmasks,
null);
--- a/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -272,7 +272,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int outData[];
+ int[] outData;
if (obj == null) {
outData = new int[numDataElements];
} else {
@@ -320,7 +320,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int outData[];
+ int[] outData;
if (obj instanceof int[]) {
outData = (int[])obj;
} else {
@@ -364,7 +364,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int inData[] = (int[])obj;
+ int[] inData = (int[])obj;
int off = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
@@ -423,7 +423,7 @@
int srcOffX = inRaster.getMinX();
int srcOffY = inRaster.getMinY();
- int tdata[] = null;
+ int[] tdata = null;
if (inRaster instanceof IntegerComponentRaster &&
(pixelStride == 1) && (numDataElements == 1)) {
@@ -496,7 +496,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int inData[] = (int[])obj;
+ int[] inData = (int[])obj;
int yoff = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
@@ -540,7 +540,7 @@
public WritableRaster createWritableChild (int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
if (x < this.minX) {
throw new RasterFormatException("x lies outside raster");
}
@@ -594,7 +594,7 @@
public Raster createChild (int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
return createWritableChild(x, y, width, height, x0, y0, bandList);
}
--- a/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -215,7 +215,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int outData[];
+ int[] outData;
if (obj == null) {
outData = new int[1];
} else {
@@ -260,7 +260,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int outData[];
+ int[] outData;
if (obj instanceof int[]) {
outData = (int[])obj;
} else {
@@ -297,7 +297,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int inData[] = (int[])obj;
+ int[] inData = (int[])obj;
int off = (y-minY)*scanlineStride + (x-minX) + dataOffsets[0];
@@ -354,7 +354,7 @@
int srcOffX = inRaster.getMinX();
int srcOffY = inRaster.getMinY();
- int tdata[] = null;
+ int[] tdata = null;
if (inRaster instanceof IntegerInterleavedRaster) {
IntegerInterleavedRaster ict = (IntegerInterleavedRaster) inRaster;
@@ -417,7 +417,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- int inData[] = (int[])obj;
+ int[] inData = (int[])obj;
int yoff = (y-minY)*scanlineStride + (x-minX) + dataOffsets[0];
int off = 0;
@@ -452,7 +452,7 @@
public WritableRaster createWritableChild (int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
if (x < this.minX) {
throw new RasterFormatException("x lies outside raster");
}
@@ -506,7 +506,7 @@
public Raster createChild (int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
return createWritableChild(x, y, width, height, x0, y0, bandList);
}
--- a/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -63,14 +63,14 @@
initIDs(InputStreamClass);
RGBcolormodel = new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
ARGBcolormodel = ColorModel.getRGBdefault();
- byte g[] = new byte[256];
+ byte[] g = new byte[256];
for (int i = 0; i < 256; i++) {
g[i] = (byte) i;
}
Graycolormodel = new IndexColorModel(8, 256, g, g, g);
}
- private native void readImage(InputStream is, byte buf[])
+ private native void readImage(InputStream is, byte[] buf)
throws ImageFormatException, IOException;
Hashtable<String, Object> props = new Hashtable<>();
@@ -115,7 +115,7 @@
return true;
}
- public boolean sendPixels(int pixels[], int y) {
+ public boolean sendPixels(int[] pixels, int y) {
int count = setPixels(0, y, pixels.length, 1, colormodel,
pixels, 0, pixels.length);
if (count <= 0) {
@@ -124,7 +124,7 @@
return !aborted;
}
- public boolean sendPixels(byte pixels[], int y) {
+ public boolean sendPixels(byte[] pixels, int y) {
int count = setPixels(0, y, pixels.length, 1, colormodel,
pixels, 0, pixels.length);
if (count <= 0) {
--- a/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -76,7 +76,7 @@
private byte[] red_map, green_map, blue_map, alpha_map;
private int transparentPixel = -1;
private byte[] transparentPixel_16 = null; // we need 6 bytes to store 16bpp value
- private static ColorModel greyModels[] = new ColorModel[4];
+ private static ColorModel[] greyModels = new ColorModel[4];
/* this is not needed
PNGImageDecoder next;
*/
@@ -287,7 +287,7 @@
if((cm=greyModels[llog]) == null) {
int size = 1<<(1<<llog);
- byte ramp[] = new byte[size];
+ byte[] ramp = new byte[size];
for(int i = 0; i<size; i++) ramp[i] = (byte)(255*i/(size-1));
if (transparentPixel == -1) {
@@ -564,7 +564,7 @@
return !aborted;
}
- private void filterRow(byte rowByteBuffer[], byte[] prevRow,
+ private void filterRow(byte[] rowByteBuffer, byte[] prevRow,
int rowFilter, int rowByteWidth, int bytesPerSample)
throws IOException {
int x = 0;
@@ -684,7 +684,7 @@
fill();
if(limit-pos>=n) return true;
if(seenEOF) return false;
- byte nin[] = new byte[n+100];
+ byte[] nin = new byte[n+100];
System.arraycopy(inbuf,pos,nin,0,limit-pos);
limit = limit-pos;
pos = 0;
--- a/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -134,9 +134,9 @@
if (sampleModel instanceof BandedSampleModel) {
BandedSampleModel bsm = (BandedSampleModel)sampleModel;
this.scanlineStride = bsm.getScanlineStride();
- int bankIndices[] = bsm.getBankIndices();
- int bandOffsets[] = bsm.getBandOffsets();
- int dOffsets[] = dataBuffer.getOffsets();
+ int[] bankIndices = bsm.getBankIndices();
+ int[] bandOffsets = bsm.getBandOffsets();
+ int[] dOffsets = dataBuffer.getOffsets();
dataOffsets = new int[bankIndices.length];
data = new short[bankIndices.length][];
int xOffset = aRegion.x - origin.x;
@@ -225,7 +225,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short outData[];
+ short[] outData;
if (obj == null) {
outData = new short[numDataElements];
} else {
@@ -271,7 +271,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short outData[];
+ short[] outData;
if (obj == null) {
outData = new short[numDataElements*w*h];
} else {
@@ -411,7 +411,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short inData[] = (short[])obj;
+ short[] inData = (short[])obj;
int off = (y-minY)*scanlineStride + (x-minX);
for (int i = 0; i < numDataElements; i++) {
data[i][dataOffsets[i] + off] = inData[i];
@@ -508,7 +508,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short inData[] = (short[])obj;
+ short[] inData = (short[])obj;
int yoff = (y-minY)*scanlineStride + (x-minX);
for (int c = 0; c < numDataElements; c++) {
@@ -638,7 +638,7 @@
public WritableRaster createWritableChild(int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
if (x < this.minX) {
throw new RasterFormatException("x lies outside raster");
@@ -694,7 +694,7 @@
public Raster createChild (int x, int y,
int width, int height,
int x0, int y0,
- int bandList[]) {
+ int[] bandList) {
return createWritableChild(x, y, width, height, x0, y0, bandList);
}
--- a/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -259,7 +259,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short outData[];
+ short[] outData;
if (obj == null) {
outData = new short[numDataElements];
} else {
@@ -307,7 +307,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short outData[];
+ short[] outData;
if (obj == null) {
outData = new short[w*h*numDataElements];
} else {
@@ -460,7 +460,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short inData[] = (short[])obj;
+ short[] inData = (short[])obj;
int off = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
for (int i = 0; i < numDataElements; i++) {
@@ -558,7 +558,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short inData[] = (short[])obj;
+ short[] inData = (short[])obj;
int yoff = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
int xoff;
--- a/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -233,7 +233,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short outData[];
+ short[] outData;
if (obj == null) {
outData = new short[numDataElements];
} else {
@@ -281,7 +281,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short outData[];
+ short[] outData;
if (obj == null) {
outData = new short[w*h*numDataElements];
} else {
@@ -434,7 +434,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short inData[] = (short[])obj;
+ short[] inData = (short[])obj;
int off = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
for (int i = 0; i < numDataElements; i++) {
@@ -531,7 +531,7 @@
throw new ArrayIndexOutOfBoundsException
("Coordinate out of bounds!");
}
- short inData[] = (short[])obj;
+ short[] inData = (short[])obj;
int yoff = (y-minY)*scanlineStride +
(x-minX)*pixelStride;
int xoff;
--- a/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, 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
@@ -44,7 +44,7 @@
* @author James Gosling
*/
public class XbmImageDecoder extends ImageDecoder {
- private static byte XbmColormap[] = {(byte) 255, (byte) 255, (byte) 255,
+ private static byte[] XbmColormap = {(byte) 255, (byte) 255, (byte) 255,
0, 0, 0};
private static int XbmHints = (ImageConsumer.TOPDOWNLEFTRIGHT |
ImageConsumer.COMPLETESCANLINES |
@@ -72,7 +72,7 @@
* produce an image from the stream.
*/
public void produceImage() throws IOException, ImageFormatException {
- char nm[] = new char[80];
+ char[] nm = new char[80];
int c;
int i = 0;
int state = 0;
@@ -81,7 +81,7 @@
int x = 0;
int y = 0;
boolean start = true;
- byte raster[] = null;
+ byte[] raster = null;
IndexColorModel model = null;
while (!aborted && (c = input.read()) != -1) {
if ('a' <= c && c <= 'z' ||
--- a/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/shell/ShellFolderManager.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -28,6 +28,8 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.util.concurrent.Callable;
+import java.util.stream.Stream;
+
/**
* @author Michael Martak
@@ -68,13 +70,13 @@
// Return the default shellfolder for a new filechooser
File homeDir = new File(System.getProperty("user.home"));
try {
- return createShellFolder(homeDir);
+ return checkFile(createShellFolder(homeDir));
} catch (FileNotFoundException e) {
- return homeDir;
+ return checkFile(homeDir);
}
} else if (key.equals("roots")) {
// The root(s) of the displayable hierarchy
- return File.listRoots();
+ return checkFiles(File.listRoots());
} else if (key.equals("fileChooserComboBoxFolders")) {
// Return an array of ShellFolders representing the list to
// show by default in the file chooser's combobox
@@ -84,11 +86,42 @@
// folders, such as Desktop, Documents, History, Network, Home, etc.
// This is used in the shortcut panel of the filechooser on Windows 2000
// and Windows Me
- return new File[] { (File)get("fileChooserDefaultFolder") };
+ return checkFiles(new File[] { (File)get("fileChooserDefaultFolder") });
}
+
return null;
}
+ private static File checkFile(File f) {
+ SecurityManager sm = System.getSecurityManager();
+ return (sm == null || f == null) ? f : checkFile(f, sm);
+ }
+
+ private static File checkFile(File f, SecurityManager sm) {
+ try {
+ sm.checkRead(f.getPath());
+ if (f instanceof ShellFolder) {
+ ShellFolder sf = (ShellFolder)f;
+ if (sf.isLink()) {
+ sm.checkRead(sf.getLinkLocation().getPath());
+ }
+ }
+ return f;
+ } catch (SecurityException | FileNotFoundException e) {
+ return null;
+ }
+ }
+
+ private static File[] checkFiles(File[] fs) {
+ SecurityManager sm = System.getSecurityManager();
+ return (sm == null || fs == null) ? fs : checkFiles(Stream.of(fs), sm);
+ }
+
+ private static File[] checkFiles(Stream<File> fs, SecurityManager sm) {
+ return fs.filter(f -> f != null && checkFile(f, sm) != null)
+ .toArray(File[]::new);
+ }
+
/**
* Does {@code dir} represent a "computer" such as a node on the network, or
* "My Computer" on the desktop.
--- a/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -172,7 +172,7 @@
modCount++;
int oldCapacity = elementData.length;
if (minCapacity > oldCapacity) {
- Object oldData[] = elementData;
+ Object[] oldData = elementData;
int newCapacity = (oldCapacity * 3)/2 + 1;
if (newCapacity < minCapacity)
newCapacity = minCapacity;
--- a/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -53,7 +53,7 @@
CompositeFont font;
- CharToGlyphMapper slotMappers[];
+ CharToGlyphMapper[] slotMappers;
int[][] glyphMaps;
private boolean hasExcludes;
--- a/src/java.desktop/share/classes/sun/font/Font2D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/Font2D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -405,7 +405,7 @@
*/
public void getFontMetrics(Font font, AffineTransform at,
Object aaHint, Object fmHint,
- float metrics[]) {
+ float[] metrics) {
/* This is called in just one place in Font with "at" == identity.
* Perhaps this can be eliminated.
*/
@@ -449,7 +449,7 @@
* metrics[3]: max advance
*/
public void getFontMetrics(Font font, FontRenderContext frc,
- float metrics[]) {
+ float[] metrics) {
StrikeMetrics strikeMetrics = getStrike(font, frc).getFontMetrics();
metrics[0] = strikeMetrics.getAscent();
metrics[1] = strikeMetrics.getDescent();
--- a/src/java.desktop/share/classes/sun/font/FontDesignMetrics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/FontDesignMetrics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -487,7 +487,7 @@
return (int) (0.5 + width);
}
- public int charsWidth(char data[], int off, int len) {
+ public int charsWidth(char[] data, int off, int len) {
float width = 0;
if (font.hasLayoutAttributes()) {
@@ -524,7 +524,7 @@
* the arguments and that the text is simple and there are no
* layout attributes, font transform etc.
*/
- public Rectangle2D getSimpleBounds(char data[], int off, int len) {
+ public Rectangle2D getSimpleBounds(char[] data, int off, int len) {
float width = 0;
int limit = off + len;
--- a/src/java.desktop/share/classes/sun/font/GlyphList.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/GlyphList.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -83,8 +83,8 @@
private static final int DEFAULT_LENGTH = 32;
int glyphindex;
- int metrics[];
- byte graybits[];
+ int[] metrics;
+ byte[] graybits;
/* A reference to the strike is needed for the case when the GlyphList
* may be added to a queue for batch processing, (e.g. OpenGL) and we need
@@ -107,10 +107,10 @@
int len = 0;
int maxLen = 0;
int maxPosLen = 0;
- int glyphData[];
- char chData[];
- long images[];
- float positions[];
+ int[] glyphData;
+ char[] chData;
+ long[] images;
+ float[] positions;
float x, y;
float gposx, gposy;
boolean usePositions;
--- a/src/java.desktop/share/classes/sun/font/ScriptRun.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/ScriptRun.java Wed Oct 24 13:35:18 2018 +0530
@@ -80,7 +80,7 @@
private int scriptLimit;
private int scriptCode;
- private int stack[]; // stack used to handle paired punctuation if encountered
+ private int[] stack; // stack used to handle paired punctuation if encountered
private int parenSP;
public ScriptRun() {
@@ -354,7 +354,7 @@
}
// all common
- private static int pairedChars[] = {
+ private static int[] pairedChars = {
0x0028, 0x0029, // ascii paired punctuation // common
0x003c, 0x003e, // common
0x005b, 0x005d, // common
--- a/src/java.desktop/share/classes/sun/font/SunFontManager.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java Wed Oct 24 13:35:18 2018 +0530
@@ -145,7 +145,7 @@
*/
// MACOSX begin -- need to access these in subclass
protected static final int CHANNELPOOLSIZE = 20;
- protected FileFont fontFileCache[] = new FileFont[CHANNELPOOLSIZE];
+ protected FileFont[] fontFileCache = new FileFont[CHANNELPOOLSIZE];
// MACOSX end
private int lastPoolIndex = 0;
--- a/src/java.desktop/share/classes/sun/font/TrueTypeFont.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -614,7 +614,7 @@
* the windows encodings we expect as the default encoding in
* supported locales, so we only map the first of these fields.
*/
- static final String encoding_mapping[] = {
+ static final String[] encoding_mapping = {
"cp1252", /* 0:Latin 1 */
"cp1250", /* 1:Latin 2 */
"cp1251", /* 2:Cyrillic */
@@ -662,7 +662,7 @@
* from needing to map to this small and incomplete set of Windows
* code pages which looks odd on non-Windows platforms.
*/
- private static final String languages[][] = {
+ private static final String[][] languages = {
/* cp1252/Latin 1 */
{ "en", "ca", "da", "de", "es", "fi", "fr", "is", "it",
@@ -709,7 +709,7 @@
{ "ko" },
};
- private static final String codePages[] = {
+ private static final String[] codePages = {
"cp1252",
"cp1250",
"cp1251",
--- a/src/java.desktop/share/classes/sun/font/Type1Font.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/font/Type1Font.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -114,14 +114,14 @@
several capital letters because current expansion algorithm do not support this.
(namely we have omited MM aka "Multiple Master", OsF aka "Oldstyle figures",
OS aka "Oldstyle", SC aka "Small caps" and DS aka "Display" */
- String nm[] = {"Black", "Bold", "Book", "Demi", "Heavy", "Light",
+ String[] nm = {"Black", "Bold", "Book", "Demi", "Heavy", "Light",
"Meduium", "Nord", "Poster", "Regular", "Super", "Thin",
"Compressed", "Condensed", "Compact", "Extended", "Narrow",
"Inclined", "Italic", "Kursiv", "Oblique", "Upright", "Sloped",
"Semi", "Ultra", "Extra",
"Alternate", "Alternate", "Deutsche Fraktur", "Expert", "Inline", "Ornaments",
"Outline", "Roman", "Rounded", "Script", "Shaded", "Swash", "Titling", "Typewriter"};
- String abbrv[] = {"Blk", "Bd", "Bk", "Dm", "Hv", "Lt",
+ String[] abbrv = {"Blk", "Bd", "Bk", "Dm", "Hv", "Lt",
"Md", "Nd", "Po", "Rg", "Su", "Th",
"Cm", "Cn", "Ct", "Ex", "Nr",
"Ic", "It", "Ks", "Obl", "Up", "Sl",
@@ -131,7 +131,7 @@
/* This is only subset of names from nm[] because we want to distinguish things
like "Lucida Sans TypeWriter Bold" and "Lucida Sans Bold".
Names from "Design and/or special purpose" group are omitted. */
- String styleTokens[] = {"Black", "Bold", "Book", "Demi", "Heavy", "Light",
+ String[] styleTokens = {"Black", "Bold", "Book", "Demi", "Heavy", "Light",
"Medium", "Nord", "Poster", "Regular", "Super", "Thin",
"Compressed", "Condensed", "Compact", "Extended", "Narrow",
"Inclined", "Italic", "Kursiv", "Oblique", "Upright", "Sloped", "Slanted",
--- a/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -1858,7 +1858,7 @@
// optimal test for most transforms and so the conservative
// answer should not cause too much extra work.
- double d[] = {
+ double[] d = {
x, y,
x+width, y,
x, y+height,
@@ -1905,7 +1905,7 @@
clipRegion = devClip.getIntersection((Rectangle2D) usrClip);
} else {
PathIterator cpi = usrClip.getPathIterator(null);
- int box[] = new int[4];
+ int[] box = new int[4];
ShapeSpanIterator sr = LoopPipe.getFillSSI(this);
try {
sr.setOutputArea(devClip);
@@ -1992,7 +1992,7 @@
(tx.getType() & NON_RECTILINEAR_TRANSFORM_MASK) == 0)
{
Rectangle2D rect = (Rectangle2D) clip;
- double matrix[] = new double[4];
+ double[] matrix = new double[4];
matrix[0] = rect.getX();
matrix[1] = rect.getY();
matrix[2] = matrix[0] + rect.getWidth();
@@ -2351,7 +2351,7 @@
}
}
- public void drawPolyline(int xPoints[], int yPoints[], int nPoints) {
+ public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) {
try {
drawpipe.drawPolyline(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e) {
@@ -2368,7 +2368,7 @@
}
}
- public void drawPolygon(int xPoints[], int yPoints[], int nPoints) {
+ public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) {
try {
drawpipe.drawPolygon(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e) {
@@ -2385,7 +2385,7 @@
}
}
- public void fillPolygon(int xPoints[], int yPoints[], int nPoints) {
+ public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) {
try {
fillpipe.fillPolygon(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e) {
@@ -2586,7 +2586,7 @@
Rectangle result = null;
try {
- double p[] = new double[8];
+ double[] p = new double[8];
p[0] = p[2] = compClip.getLoX();
p[4] = p[6] = compClip.getHiX();
p[1] = p[5] = compClip.getLoY();
@@ -3016,7 +3016,7 @@
}
}
- public void drawChars(char data[], int offset, int length, int x, int y) {
+ public void drawChars(char[] data, int offset, int length, int x, int y) {
if (data == null) {
throw new NullPointerException("char data is null");
@@ -3049,7 +3049,7 @@
}
}
- public void drawBytes(byte data[], int offset, int length, int x, int y) {
+ public void drawBytes(byte[] data, int offset, int length, int x, int y) {
if (data == null) {
throw new NullPointerException("byte data is null");
}
@@ -3057,7 +3057,7 @@
throw new ArrayIndexOutOfBoundsException("bad offset/length");
}
/* Byte data is interpreted as 8-bit ASCII. Re-use drawChars loops */
- char chData[] = new char[length];
+ char[] chData = new char[length];
for (int i = length; i-- > 0; ) {
chData[i] = (char)(data[i+offset] & 0xff);
}
--- a/src/java.desktop/share/classes/sun/java2d/loops/Blit.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/Blit.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -165,7 +165,7 @@
if (clip == null) {
clip = Region.getInstanceXYWH(dstx, dsty, width, height);
}
- int span[] = {dstx, dsty, dstx+width, dsty+height};
+ int[] span = {dstx, dsty, dstx+width, dsty+height};
SpanIterator si = clip.getSpanIterator(span);
srcx -= dstx;
srcy -= dsty;
--- a/src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -135,7 +135,7 @@
// assert(icr.getPixelStride() == 1);
srcx -= dstx;
srcy -= dsty;
- int span[] = new int[4];
+ int[] span = new int[4];
while (si.nextSpan(span)) {
int rowoff = icr.getDataOffset(0) + span[1] * dstScan + span[0];
for (int y = span[1]; y < span[3]; y++) {
@@ -191,7 +191,7 @@
// assert(icr.getPixelStride() == 1);
srcx -= dstx;
srcy -= dsty;
- int span[] = new int[4];
+ int[] span = new int[4];
while (si.nextSpan(span)) {
int rowoff = (icr.getDataOffset(0) +
(srcy + span[1]) * srcScan +
@@ -250,7 +250,7 @@
// assert(icr.getPixelStride() == 1);
srcx -= dstx;
srcy -= dsty;
- int span[] = new int[4];
+ int[] span = new int[4];
while (si.nextSpan(span)) {
int rowoff = (icr.getDataOffset(0) +
(srcy + span[1]) * srcScan +
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -97,7 +97,7 @@
public void DrawGlyphList(SunGraphics2D sg2d, SurfaceData dest,
GlyphList gl) {
- int strbounds[] = gl.getBounds(); // Don't delete, bug 4895493
+ int[] strbounds = gl.getBounds(); // Don't delete, bug 4895493
int num = gl.getNumGlyphs();
Region clip = sg2d.getCompClip();
int cx1 = clip.getLoX();
@@ -106,7 +106,7 @@
int cy2 = clip.getHiY();
for (int i = 0; i < num; i++) {
gl.setGlyphIndex(i);
- int metrics[] = gl.getMetrics();
+ int[] metrics = gl.getMetrics();
int gx1 = metrics[0];
int gy1 = metrics[1];
int w = metrics[2];
@@ -124,7 +124,7 @@
if (gx2 > cx2) gx2 = cx2;
if (gy2 > cy2) gy2 = cy2;
if (gx2 > gx1 && gy2 > gy1) {
- byte alpha[] = gl.getGrayBits();
+ byte[] alpha = gl.getGrayBits();
maskop.MaskFill(sg2d, dest, sg2d.composite,
gx1, gy1, gx2 - gx1, gy2 - gy1,
alpha, off, w);
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -104,7 +104,7 @@
int cy2 = clip.getHiY();
for (int i = 0; i < num; i++) {
gl.setGlyphIndex(i);
- int metrics[] = gl.getMetrics();
+ int[] metrics = gl.getMetrics();
int gx1 = metrics[0];
int gy1 = metrics[1];
int w = metrics[2];
@@ -122,7 +122,7 @@
if (gx2 > cx2) gx2 = cx2;
if (gy2 > cy2) gy2 = cy2;
if (gx2 > gx1 && gy2 > gy1) {
- byte alpha[] = gl.getGrayBits();
+ byte[] alpha = gl.getGrayBits();
maskop.MaskFill(sg2d, dest, sg2d.composite,
gx1, gy1, gx2 - gx1, gy2 - gy1,
alpha, off, w);
--- a/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -73,8 +73,8 @@
* All DrawPolygon implementors must have this invoker method
*/
public native void DrawPolygons(SunGraphics2D sg2d, SurfaceData sData,
- int xPoints[], int yPoints[],
- int nPoints[], int numPolys,
+ int[] xPoints, int[] yPoints,
+ int[] nPoints, int numPolys,
int transX, int transY,
boolean close);
@@ -106,8 +106,8 @@
}
public void DrawPolygons(SunGraphics2D sg2d, SurfaceData sData,
- int xPoints[], int yPoints[],
- int nPoints[], int numPolys,
+ int[] xPoints, int[] yPoints,
+ int[] nPoints, int numPolys,
int transX, int transY,
boolean close)
{
--- a/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -152,7 +152,7 @@
}
static void doDrawPoly(SurfaceData sData, PixelWriter pw,
- int xPoints[], int yPoints[], int off, int nPoints,
+ int[] xPoints, int[] yPoints, int off, int nPoints,
Region clip, int transx, int transy, boolean close)
{
int mx, my, x1, y1;
@@ -381,7 +381,7 @@
int num = gl.getNumGlyphs();
for (int i = 0; i < num; i++) {
gl.setGlyphIndex(i);
- int metrics[] = gl.getMetrics();
+ int[] metrics = gl.getMetrics();
int gx1 = metrics[0];
int gy1 = metrics[1];
int w = metrics[2];
@@ -399,7 +399,7 @@
if (gx2 > cx2) gx2 = cx2;
if (gy2 > cy2) gy2 = cy2;
if (gx2 > gx1 && gy2 > gy1) {
- byte alpha[] = gl.getGrayBits();
+ byte[] alpha = gl.getGrayBits();
w -= (gx2 - gx1);
for (int y = gy1; y < gy2; y++) {
for (int x = gx1; x < gx2; x++) {
@@ -724,7 +724,7 @@
{
PixelWriter pw = GeneralRenderer.createSolidPixelWriter(sg2d, sData);
- int span[] = new int[4];
+ int[] span = new int[4];
while (si.nextSpan(span)) {
GeneralRenderer.doSetRect(sData, pw,
span[0], span[1], span[2], span[3]);
@@ -764,8 +764,8 @@
}
public void DrawPolygons(SunGraphics2D sg2d, SurfaceData sData,
- int xPoints[], int yPoints[],
- int nPoints[], int numPolys,
+ int[] xPoints, int[] yPoints,
+ int[] nPoints, int numPolys,
int transx, int transy,
boolean close)
{
@@ -869,7 +869,7 @@
{
PixelWriter pw = GeneralRenderer.createXorPixelWriter(sg2d, sData);
- int span[] = new int[4];
+ int[] span = new int[4];
while (si.nextSpan(span)) {
GeneralRenderer.doSetRect(sData, pw,
span[0], span[1], span[2], span[3]);
@@ -909,8 +909,8 @@
}
public void DrawPolygons(SunGraphics2D sg2d, SurfaceData sData,
- int xPoints[], int yPoints[],
- int nPoints[], int numPolys,
+ int[] xPoints, int[] yPoints,
+ int[] nPoints, int numPolys,
int transx, int transy,
boolean close)
{
--- a/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -41,8 +41,8 @@
public final class GraphicsPrimitiveMgr {
private static final boolean debugTrace = false;
- private static GraphicsPrimitive primitives[];
- private static GraphicsPrimitive generalPrimitives[];
+ private static GraphicsPrimitive[] primitives;
+ private static GraphicsPrimitive[] generalPrimitives;
private static boolean needssort = true;
private static native void initIDs(Class<?> GP, Class<?> ST, Class<?> CT,
@@ -320,7 +320,7 @@
" total graphics primitives");
}
- public static void main(String argv[]) {
+ public static void main(String[] argv) {
// REMIND: Should trigger loading of platform primitives somehow...
if (needssort) {
Arrays.sort(primitives, primSorter);
--- a/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -171,7 +171,7 @@
int srcx, int srcy,
int dstx, int dsty,
int width, int height,
- byte mask[], int offset, int scan)
+ byte[] mask, int offset, int scan)
{
SurfaceData src, dst;
Region opclip;
--- a/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -181,7 +181,7 @@
SurfaceData sData,
Composite comp,
int x, int y, int w, int h,
- byte mask[], int offset, int scan)
+ byte[] mask, int offset, int scan)
{
BufferedImage dstBI =
new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
--- a/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -860,7 +860,7 @@
/* Temporary array for holding parameters corresponding to the extreme
* in X and Y points
*/
- double params[] = new double[2];
+ double[] params = new double[2];
int cnt = 0;
double param;
@@ -1228,9 +1228,9 @@
/* Temporary array for holding parameters corresponding to the extreme
* in X and Y points
*/
- double params[] = new double[4];
- double eqn[] = new double[3];
- double res[] = new double[2];
+ double[] params = new double[4];
+ double[] eqn = new double[3];
+ double[] res = new double[2];
int cnt = 0;
/* Simple check for monotonicity in X before searching for the extreme
@@ -1362,7 +1362,7 @@
int X1, Y1, X2, Y2, X3, Y3, res;
boolean clipped = false;
float x3,y3;
- float c[] = new float[]{x1, y1, x2, y2, 0, 0};
+ float[] c = new float[]{x1, y1, x2, y2, 0, 0};
boolean lastClipped;
@@ -1466,11 +1466,11 @@
private static boolean doProcessPath(ProcessHandler hnd,
Path2D.Float p2df,
float transXf, float transYf) {
- float coords[] = new float[8];
- float tCoords[] = new float[8];
- float closeCoord[] = new float[] {0.0f, 0.0f};
- float firstCoord[] = new float[2];
- int pixelInfo[] = new int[5];
+ float[] coords = new float[8];
+ float[] tCoords = new float[8];
+ float[] closeCoord = new float[] {0.0f, 0.0f};
+ float[] firstCoord = new float[2];
+ int[] pixelInfo = new int[5];
boolean subpathStarted = false;
boolean skip = false;
float lastX, lastY;
@@ -2043,7 +2043,7 @@
/* This function is used only for filling shapes, so there is no
* check for the type of clipping
*/
- int c[] = new int[]{x1, y1, x2, y2, 0, 0};
+ int[] c = new int[]{x1, y1, x2, y2, 0, 0};
outXMin = (int)(dhnd.xMinf * MDP_MULT);
outXMax = (int)(dhnd.xMaxf * MDP_MULT);
outYMin = (int)(dhnd.yMinf * MDP_MULT);
--- a/src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -61,7 +61,7 @@
}
}
- private Entry entries[];
+ private Entry[] entries;
public RenderCache(int size) {
entries = new Entry[size];
--- a/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, 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
@@ -96,7 +96,7 @@
AffineTransform itx, int txtype,
int sx1, int sy1, int sx2, int sy2,
int dx1, int dy1, int dx2, int dy2,
- int edges[], int dxoff, int dyoff);
+ int[] edges, int dxoff, int dyoff);
public GraphicsPrimitive makePrimitive(SurfaceType srctype,
CompositeType comptype,
@@ -127,7 +127,7 @@
AffineTransform itx, int txtype,
int sx1, int sy1, int sx2, int sy2,
int dx1, int dy1, int dx2, int dy2,
- int edges[], int dxoff, int dyoff)
+ int[] edges, int dxoff, int dyoff)
{
tracePrimitive(target);
target.Transform(output, src, dst, comp, clip, itx, txtype,
--- a/src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -101,7 +101,7 @@
* Either this method, or the nextTile() method should be called
* once per tile, but not both.
*/
- public void getAlpha(byte tile[], int offset, int rowstride);
+ public void getAlpha(byte[] tile, int offset, int rowstride);
/**
* Disposes this tile generator.
--- a/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -357,7 +357,7 @@
buf.putInt(0);
int spanCount = 0;
int remainingSpans = buf.remaining() / BYTES_PER_SPAN;
- int span[] = new int[4];
+ int[] span = new int[4];
SpanIterator si = clip.getSpanIterator();
while (si.nextSpan(span)) {
if (remainingSpans == 0) {
--- a/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -174,7 +174,7 @@
// Transform source bounds by extraAT,
// then translate the bounds again by x, y
// then transform the bounds again by sg.transform
- double coords[] = new double[] {
+ double[] coords = new double[] {
0, 0, imgw, imgh,
};
extraAT.transform(coords, 0, coords, 0, 2);
@@ -241,7 +241,7 @@
// Note that we use (0,0,w,h) instead of (sx1,sy1,sx2,sy2)
// because the transform is already translated such that
// the origin is where sx1, sy1 should go.
- double coords[] = new double[6];
+ double[] coords = new double[6];
/* index: 0 1 2 3 4 5 */
/* coord: (0, 0), (w, h), (0, h) */
coords[2] = sx2 - sx1;
@@ -276,7 +276,7 @@
int sx1, int sy1,
int sx2, int sy2,
Color bgColor, int interpType,
- double coords[])
+ double[] coords)
{
double dx1 = coords[0];
double dy1 = coords[1];
--- a/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -51,7 +51,7 @@
float devx, devy;
if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
- double origin[] = {x + info.originX, y + info.originY};
+ double[] origin = {x + info.originX, y + info.originY};
sg2d.transform.transform(origin, 0, origin, 0, 1);
devx = (float)origin[0];
devy = (float)origin[1];
@@ -76,7 +76,7 @@
}
public void drawChars(SunGraphics2D sg2d,
- char data[], int offset, int length,
+ char[] data, int offset, int length,
int ix, int iy)
{
FontInfo info = sg2d.getFontInfo();
@@ -87,7 +87,7 @@
return;
}
if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
- double origin[] = {ix + info.originX, iy + info.originY};
+ double[] origin = {ix + info.originX, iy + info.originY};
sg2d.transform.transform(origin, 0, origin, 0, 1);
x = (float) origin[0];
y = (float) origin[1];
@@ -119,7 +119,7 @@
return;
}
if (sg2d.transformState >= SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
- double origin[] = {x, y};
+ double[] origin = {x, y};
sg2d.transform.transform(origin, 0, origin, 0, 1);
x = (float) origin[0];
y = (float) origin[1];
--- a/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -92,10 +92,10 @@
}
public void drawPolyline(SunGraphics2D sg2d,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints)
{
- int nPointsArray[] = { nPoints };
+ int[] nPointsArray = { nPoints };
sg2d.loops.drawPolygonsLoop.DrawPolygons(sg2d, sg2d.getSurfaceData(),
xPoints, yPoints,
nPointsArray, 1,
@@ -104,10 +104,10 @@
}
public void drawPolygon(SunGraphics2D sg2d,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints)
{
- int nPointsArray[] = { nPoints };
+ int[] nPointsArray = { nPoints };
sg2d.loops.drawPolygonsLoop.DrawPolygons(sg2d, sg2d.getSurfaceData(),
xPoints, yPoints,
nPointsArray, 1,
@@ -149,7 +149,7 @@
}
public void fillPolygon(SunGraphics2D sg2d,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints)
{
ShapeSpanIterator sr = getFillSSI(sg2d);
@@ -333,7 +333,7 @@
return;
}
}
- int spanbox[] = new int[4];
+ int[] spanbox = new int[4];
SurfaceData sd = sg2d.getSurfaceData();
while (si.nextSpan(spanbox)) {
int x = spanbox[0];
--- a/src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -87,17 +87,17 @@
}
public void drawPolyline(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
}
public void drawPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
}
public void fillPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
}
@@ -115,7 +115,7 @@
}
public void drawChars(SunGraphics2D sg,
- char data[], int offset, int length,
+ char[] data, int offset, int length,
int x, int y) {
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -64,7 +64,7 @@
public static final int THRESHHOLD = 100;
public void drawChars(SunGraphics2D g2d,
- char data[], int offset, int length,
+ char[] data, int offset, int length,
int x, int y) {
String s = new String(data, offset, length);
--- a/src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -58,10 +58,10 @@
int startAngle, int arcAngle);
public void drawPolyline(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints);
public void drawPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints);
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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,6 @@
int startAngle, int arcAngle);
public void fillPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints);
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -201,7 +201,7 @@
case SunGraphics2D.TRANSFORM_GENERIC:
case SunGraphics2D.TRANSFORM_TRANSLATESCALE:
{
- double coords[] = {ux1, uy1, ux2, uy2};
+ double[] coords = {ux1, uy1, ux2, uy2};
sg2d.transform.transform(coords, 0, coords, 0, 2);
x1 = coords[0];
y1 = coords[1];
@@ -257,7 +257,7 @@
// dy = 0; already
}
// delta transform the transposed (90 degree rotated) unit vector
- double unitvector[] = {dy/len, -dx/len};
+ double[] unitvector = {dy/len, -dx/len};
sg2d.transform.deltaTransform(unitvector, 0, unitvector, 0, 1);
lw *= len(unitvector[0], unitvector[1]);
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -98,7 +98,7 @@
start, extent, Arc2D.PIE));
}
- private Shape makePoly(int xPoints[], int yPoints[],
+ private Shape makePoly(int[] xPoints, int[] yPoints,
int nPoints, boolean close) {
GeneralPath gp = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
if (nPoints > 0) {
@@ -114,19 +114,19 @@
}
public void drawPolyline(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
outpipe.draw(sg, makePoly(xPoints, yPoints, nPoints, false));
}
public void drawPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
outpipe.draw(sg, makePoly(xPoints, yPoints, nPoints, true));
}
public void fillPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
outpipe.fill(sg, makePoly(xPoints, yPoints, nPoints, true));
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/Region.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/Region.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -267,7 +267,7 @@
return EMPTY_REGION;
}
- int box[] = new int[4];
+ int[] box = new int[4];
ShapeSpanIterator sr = new ShapeSpanIterator(normalize);
try {
sr.setOutputArea(devBounds);
@@ -346,7 +346,7 @@
* This method can also be used to create a simple rectangular
* region.
*/
- public static Region getInstance(int box[]) {
+ public static Region getInstance(int[] box) {
return new Region(box[0], box[1], box[2], box[3]);
}
@@ -370,7 +370,7 @@
* it must have a Y range equal to the highest Y band in the region and a
* higher X coordinate than any of the spans in that band.
*/
- public static Region getInstance(int box[], SpanIterator si) {
+ public static Region getInstance(int[] box, SpanIterator si) {
Region ret = new Region(box[0], box[1], box[2], box[3]);
ret.appendSpans(si);
return ret;
@@ -411,10 +411,10 @@
int thix = clipScale(hix, sx);
int thiy = clipScale(hiy, sy);
Region ret = new Region(tlox, tloy, thix, thiy);
- int bands[] = this.bands;
+ int[] bands = this.bands;
if (bands != null) {
int end = endIndex;
- int newbands[] = new int[end];
+ int[] newbands = new int[end];
int i = 0; // index for source bands
int j = 0; // index for translated newbands
int ncol;
@@ -488,11 +488,11 @@
return getSafeTranslatedRegion(dx, dy);
}
Region ret = new Region(tlox, tloy, thix, thiy);
- int bands[] = this.bands;
+ int[] bands = this.bands;
if (bands != null) {
int end = endIndex;
ret.endIndex = end;
- int newbands[] = new int[end];
+ int[] newbands = new int[end];
ret.bands = newbands;
int i = 0;
int ncol;
@@ -515,10 +515,10 @@
int thix = clipAdd(hix, dx);
int thiy = clipAdd(hiy, dy);
Region ret = new Region(tlox, tloy, thix, thiy);
- int bands[] = this.bands;
+ int[] bands = this.bands;
if (bands != null) {
int end = endIndex;
- int newbands[] = new int[end];
+ int[] newbands = new int[end];
int i = 0; // index for source bands
int j = 0; // index for translated newbands
int ncol;
@@ -746,15 +746,15 @@
private static final int INCLUDE_COMMON = 4;
private void filterSpans(Region ra, Region rb, int flags) {
- int abands[] = ra.bands;
- int bbands[] = rb.bands;
+ int[] abands = ra.bands;
+ int[] bbands = rb.bands;
if (abands == null) {
abands = new int[] {ra.loy, ra.hiy, 1, ra.lox, ra.hix};
}
if (bbands == null) {
bbands = new int[] {rb.loy, rb.hiy, 1, rb.lox, rb.hix};
}
- int box[] = new int[6];
+ int[] box = new int[6];
int acolstart = 0;
int ay1 = abands[acolstart++];
int ay2 = abands[acolstart++];
@@ -965,7 +965,7 @@
* highest Y band in the region and a higher X coordinate
* than any of the spans in that band.
*/
- private void appendSpan(int box[]) {
+ private void appendSpan(int[] box) {
int spanlox, spanloy, spanhix, spanhiy;
if ((spanlox = box[0]) < lox) spanlox = lox;
if ((spanloy = box[1]) < loy) spanloy = loy;
@@ -1011,7 +1011,7 @@
}
}
- private void endRow(int box[]) {
+ private void endRow(int[] box) {
int cur = box[4];
int prev = box[5];
if (cur > prev) {
@@ -1273,7 +1273,7 @@
/**
* Gets the bbox of the available spans, clipped to the OutputArea.
*/
- public void getBounds(int pathbox[]) {
+ public void getBounds(int[] pathbox) {
pathbox[0] = lox;
pathbox[1] = loy;
pathbox[2] = hix;
@@ -1283,7 +1283,7 @@
/**
* Clips the indicated bbox array to the bounds of this Region.
*/
- public void clipBoxToBounds(int bbox[]) {
+ public void clipBoxToBounds(int[] bbox) {
if (bbox[0] < lox) bbox[0] = lox;
if (bbox[1] < loy) bbox[1] = loy;
if (bbox[2] > hix) bbox[2] = hix;
@@ -1308,7 +1308,7 @@
* Gets a span iterator object that iterates over the spans in this region
* but clipped to the bounds given in the argument (xlo, ylo, xhi, yhi).
*/
- public SpanIterator getSpanIterator(int bbox[]) {
+ public SpanIterator getSpanIterator(int[] bbox) {
SpanIterator result = getSpanIterator();
result.intersectClipBox(bbox[0], bbox[1], bbox[2], bbox[3]);
return result;
@@ -1395,8 +1395,8 @@
if (this.endIndex != r.endIndex) {
return false;
}
- int abands[] = this.bands;
- int bbands[] = r.bands;
+ int[] abands = this.bands;
+ int[] bbands = r.bands;
for (int i = 0; i < endIndex; i++) {
if (abands[i] != bbands[i]) {
return false;
--- a/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -79,10 +79,10 @@
int rgnbndslox, rgnbndsloy, rgnbndshix, rgnbndshiy;
// The array used to hold coordinates from the region iterator
- int rgnbox[] = new int[4];
+ int[] rgnbox = new int[4];
// The array used to hold coordinates from the span iterator
- int spanbox[] = new int[4];
+ int[] spanbox = new int[4];
// True if the next iterator span should be read on the next
// iteration of the main nextSpan() loop
@@ -138,7 +138,7 @@
* Gets the bbox of the available path segments, clipped to the
* Region.
*/
- public void getPathBox(int pathbox[]) {
+ public void getPathBox(int[] pathbox) {
int[] rgnbox = new int[4];
rgn.getBounds(rgnbox);
spanIter.getPathBox(pathbox);
@@ -174,7 +174,7 @@
* Fetches the next span that needs to be operated on.
* If the return value is false then there are no more spans.
*/
- public boolean nextSpan(int resultbox[]) {
+ public boolean nextSpan(int[] resultbox) {
if (done) {
return false;
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -70,7 +70,7 @@
* and recording the low and high Y coordinates of the
* range in the array at locations 1 and 3 respectively.
*/
- public boolean nextYRange(int range[]) {
+ public boolean nextYRange(int[] range) {
curIndex += numXbands * 2;
numXbands = 0;
if (curIndex >= region.endIndex) {
@@ -88,7 +88,7 @@
* found and recording the low and high X coordinates of
* the range in the array at locations 0 and 2 respectively.
*/
- public boolean nextXBand(int range[]) {
+ public boolean nextXBand(int[] range) {
if (numXbands <= 0) {
return false;
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -77,7 +77,7 @@
/**
* Gets the bbox of the available region spans.
*/
- public void getPathBox(int pathbox[]) {
+ public void getPathBox(int[] pathbox) {
pathbox[0] = lox;
pathbox[1] = loy;
pathbox[2] = hix;
@@ -108,7 +108,7 @@
* Fetches the next span that needs to be operated on.
* If the return value is false then there are no more spans.
*/
- public boolean nextSpan(int spanbox[]) {
+ public boolean nextSpan(int[] spanbox) {
// Quick test for end conditions
if (done) {
--- a/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java Wed Oct 24 13:35:18 2018 +0530
@@ -180,7 +180,7 @@
int caps,
int join,
float miterlimit,
- float dashes[],
+ float[] dashes,
float dashphase);
/**
@@ -271,7 +271,7 @@
BasicStroke bs,
boolean thin,
boolean normalize,
- int bbox[]);
+ int[] bbox);
/**
* Construct an antialiased tile generator for the given parallelogram
@@ -337,7 +337,7 @@
double dx2, double dy2,
double lw1, double lw2,
Region clip,
- int bbox[]);
+ int[] bbox);
/**
* Returns the minimum pen width that the antialiasing rasterizer
@@ -353,7 +353,7 @@
* feeding the consumer a segment at a time.
*/
public static void feedConsumer(PathIterator pi, PathConsumer2D consumer) {
- float coords[] = new float[6];
+ float[] coords = new float[6];
while (!pi.isDone()) {
switch (pi.currentSegment(coords)) {
case PathIterator.SEG_MOVETO:
@@ -393,7 +393,7 @@
int caps,
int join,
float miterlimit,
- float dashes[],
+ float[] dashes,
float dashphase)
{
System.out.println(name+".createStrokedShape("+
@@ -439,7 +439,7 @@
BasicStroke bs,
boolean thin,
boolean normalize,
- int bbox[])
+ int[] bbox)
{
System.out.println(name+".getAATileGenerator("+
s.getClass().getName()+", "+
@@ -457,7 +457,7 @@
double dx2, double dy2,
double lw1, double lw2,
Region clip,
- int bbox[])
+ int[] bbox)
{
System.out.println(name+".getAATileGenerator("+
x+", "+y+", "+
--- a/src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -82,7 +82,7 @@
* path iterator.
*/
public void appendPath(PathIterator pi) {
- float coords[] = new float[6];
+ float[] coords = new float[6];
setRule(pi.getWindingRule());
while (!pi.isDone()) {
@@ -95,7 +95,7 @@
/*
* Appends the geometry from the indicated set of polygon points.
*/
- public native void appendPoly(int xPoints[], int yPoints[], int nPoints,
+ public native void appendPoly(int[] xPoints, int[] yPoints, int nPoints,
int xoff, int yoff);
/*
@@ -143,13 +143,13 @@
* Adds a single PathIterator segment to the internal list of
* path element structures.
*/
- public native void addSegment(int type, float coords[]);
+ public native void addSegment(int type, float[] coords);
/*
* Gets the bbox of the available path segments, clipped to the
* OutputArea.
*/
- public native void getPathBox(int pathbox[]);
+ public native void getPathBox(int[] pathbox);
/*
* Intersects the path box with the given bbox.
@@ -162,7 +162,7 @@
* Fetches the next span that needs to be operated on.
* If the return value is false then there are no more spans.
*/
- public native boolean nextSpan(int spanbox[]);
+ public native boolean nextSpan(int[] spanbox);
/**
* This method tells the iterator that it may skip all spans
--- a/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -54,8 +54,8 @@
class SCRcontext {
RegionIterator iterator;
Object outcontext;
- int band[];
- byte tile[];
+ int[] band;
+ byte[] tile;
public SCRcontext(RegionIterator ri, Object outctx) {
iterator = ri;
--- a/src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -48,7 +48,7 @@
* {PathMinX, PathMinY, PathMaxX, PathMaxY}.
* </pre>
*/
- public void getPathBox(int pathbox[]);
+ public void getPathBox(int[] pathbox);
/**
* This method constrains the spans returned by nextSpan() to the
@@ -64,7 +64,7 @@
* {SpanMinX, SpanMinY, SpanMaxX, SpanMaxY}.
* </pre>
*/
- public boolean nextSpan(int spanbox[]);
+ public boolean nextSpan(int[] spanbox);
/**
* This method tells the iterator that it may skip all spans
--- a/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -127,7 +127,7 @@
public abstract void endSequence(Object ctx);
public void renderRect(SunGraphics2D sg, Rectangle2D r) {
- double corners[] = {
+ double[] corners = {
r.getX(), r.getY(), r.getWidth(), r.getHeight(),
};
corners[2] += corners[0];
@@ -146,7 +146,7 @@
corners[3] = corners[1];
corners[1] = t;
}
- int abox[] = {
+ int[] abox = {
(int) corners[0],
(int) corners[1],
(int) corners[2],
@@ -180,7 +180,7 @@
ShapeSpanIterator sr)
{
Object context = null;
- int abox[] = new int[4];
+ int[] abox = new int[4];
try {
sr.getPathBox(abox);
Rectangle devR = new Rectangle(abox[0], abox[1],
--- a/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -43,6 +43,6 @@
public void drawGlyphVector(SunGraphics2D g2d, GlyphVector g,
float x, float y);
public void drawChars(SunGraphics2D g2d,
- char data[], int offset, int length,
+ char[] data, int offset, int length,
int x, int y);
}
--- a/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -59,7 +59,7 @@
ctx = outpipe.startSequence(sg2d, s, r, bounds);
for (int i = 0; i < num; i++) {
gl.setGlyphIndex(i);
- int metrics[] = gl.getMetrics();
+ int[] metrics = gl.getMetrics();
int gx1 = metrics[0];
int gy1 = metrics[1];
int w = metrics[2];
@@ -79,7 +79,7 @@
if (gx2 > gx1 && gy2 > gy1 &&
outpipe.needTile(ctx, gx1, gy1, gx2 - gx1, gy2 - gy1))
{
- byte alpha[] = gl.getGrayBits();
+ byte[] alpha = gl.getGrayBits();
outpipe.renderPathTile(ctx, alpha, off, w,
gx1, gy1, gx2 - gx1, gy2 - gy1);
} else {
--- a/src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -126,7 +126,7 @@
}
public void drawPolyline(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
if (validate(sg)) {
sg.drawpipe.drawPolyline(sg, xPoints, yPoints, nPoints);
@@ -134,7 +134,7 @@
}
public void drawPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
if (validate(sg)) {
sg.drawpipe.drawPolygon(sg, xPoints, yPoints, nPoints);
@@ -142,7 +142,7 @@
}
public void fillPolygon(SunGraphics2D sg,
- int xPoints[], int yPoints[],
+ int[] xPoints, int[] yPoints,
int nPoints) {
if (validate(sg)) {
sg.fillpipe.fillPolygon(sg, xPoints, yPoints, nPoints);
@@ -172,7 +172,7 @@
}
}
public void drawChars(SunGraphics2D sg,
- char data[], int offset, int length,
+ char[] data, int offset, int length,
int x, int y) {
if (validate(sg)) {
sg.textpipe.drawChars(sg, data, offset, length, x, y);
--- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -137,7 +137,7 @@
private static final int LOWNIBBLE_MASK = 0x0000000f;
private static final int HINIBBLE_MASK = 0x000000f0;
private static final int HINIBBLE_SHIFT = 4;
- private static final byte hexDigits[] = {
+ private static final byte[] hexDigits = {
(byte)'0', (byte)'1', (byte)'2', (byte)'3',
(byte)'4', (byte)'5', (byte)'6', (byte)'7',
(byte)'8', (byte)'9', (byte)'A', (byte)'B',
@@ -732,7 +732,7 @@
* Spool to the printer.
*/
String fileName = spoolFile.getAbsolutePath();
- String execCmd[] = printExecCmd(mDestination, mOptions,
+ String[] execCmd = printExecCmd(mDestination, mOptions,
mNoJobSheet, getJobNameInt(),
1, fileName);
@@ -1590,7 +1590,7 @@
int COPIES = 0x8;
int NOSHEET = 0x10;
int pFlags = 0;
- String execCmd[];
+ String[] execCmd;
int ncomps = 2; // minimum number of print args
int n = 0;
--- a/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -78,7 +78,7 @@
private static int MAXCOPIES = 1000;
- private static final MediaSizeName mediaSizes[] = {
+ private static final MediaSizeName[] mediaSizes = {
MediaSizeName.NA_LETTER,
MediaSizeName.TABLOID,
MediaSizeName.LEDGER,
--- a/src/java.desktop/share/classes/sun/print/PathGraphics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/PathGraphics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -456,7 +456,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since 1.1
*/
- public void drawPolyline(int xPoints[], int yPoints[],
+ public void drawPolyline(int[] xPoints, int[] yPoints,
int nPoints) {
if (nPoints == 2) {
@@ -492,7 +492,7 @@
* @see java.awt.Graphics#fillPolygon
* @see java.awt.Graphics#drawPolyline
*/
- public void drawPolygon(int xPoints[], int yPoints[],
+ public void drawPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
draw(new Polygon(xPoints, yPoints, nPoints));
@@ -529,7 +529,7 @@
* @param nPoints a the total number of points.
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
*/
- public void fillPolygon(int xPoints[], int yPoints[],
+ public void fillPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
fill(new Polygon(xPoints, yPoints, nPoints));
--- a/src/java.desktop/share/classes/sun/print/PeekGraphics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/PeekGraphics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -747,7 +747,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since 1.1
*/
- public void drawPolyline(int xPoints[], int yPoints[],
+ public void drawPolyline(int[] xPoints, int[] yPoints,
int nPoints) {
if (nPoints > 0) {
int x = xPoints[0];
@@ -782,7 +782,7 @@
* @see java.awt.Graphics#drawPolyline
* @since 1.0
*/
- public void drawPolygon(int xPoints[], int yPoints[],
+ public void drawPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
if (nPoints > 0) {
drawPolyline(xPoints, yPoints, nPoints);
@@ -813,7 +813,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since 1.0
*/
- public void fillPolygon(int xPoints[], int yPoints[],
+ public void fillPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
if (nPoints > 0) {
int minX = xPoints[0];
--- a/src/java.desktop/share/classes/sun/print/PrintJob2D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/PrintJob2D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -84,7 +84,7 @@
*/
public class PrintJob2D extends PrintJob implements Printable, Runnable {
- private static final MediaType SIZES[] = {
+ private static final MediaType[] SIZES = {
MediaType.ISO_4A0, MediaType.ISO_2A0, MediaType.ISO_A0,
MediaType.ISO_A1, MediaType.ISO_A2, MediaType.ISO_A3,
MediaType.ISO_A4, MediaType.ISO_A5, MediaType.ISO_A6,
@@ -118,7 +118,7 @@
/* This array maps the above array to the objects used by the
* javax.print APIs
*/
- private static final MediaSizeName JAVAXSIZES[] = {
+ private static final MediaSizeName[] JAVAXSIZES = {
null, null, MediaSizeName.ISO_A0,
MediaSizeName.ISO_A1, MediaSizeName.ISO_A2, MediaSizeName.ISO_A3,
MediaSizeName.ISO_A4, MediaSizeName.ISO_A5, MediaSizeName.ISO_A6,
@@ -154,7 +154,7 @@
// widths and lengths in PostScript points (1/72 in.)
- private static final int WIDTHS[] = {
+ private static final int[] WIDTHS = {
/*iso-4a0*/ 4768, /*iso-2a0*/ 3370, /*iso-a0*/ 2384, /*iso-a1*/ 1684,
/*iso-a2*/ 1191, /*iso-a3*/ 842, /*iso-a4*/ 595, /*iso-a5*/ 420,
/*iso-a6*/ 298, /*iso-a7*/ 210, /*iso-a8*/ 147, /*iso-a9*/ 105,
@@ -179,7 +179,7 @@
/*invite-envelope*/ 624, /*italy-envelope*/ 312,
/*monarch-envelope*/ 279, /*personal-envelope*/ 261
};
- private static final int LENGTHS[] = {
+ private static final int[] LENGTHS = {
/*iso-4a0*/ 6741, /*iso-2a0*/ 4768, /*iso-a0*/ 3370, /*iso-a1*/ 2384,
/*iso-a2*/ 1684, /*iso-a3*/ 1191, /*iso-a4*/ 842, /*iso-a5*/ 595,
/*iso-a6*/ 420, /*iso-a7*/ 298, /*iso-a8*/ 210, /*iso-a9*/ 147,
--- a/src/java.desktop/share/classes/sun/print/ProxyGraphics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/ProxyGraphics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -649,7 +649,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since 1.1
*/
- public void drawPolyline(int xPoints[], int yPoints[],
+ public void drawPolyline(int[] xPoints, int[] yPoints,
int nPoints) {
g.drawPolyline(xPoints, yPoints, nPoints);
}
@@ -673,7 +673,7 @@
* @see java.awt.Graphics#fillPolygon
* @see java.awt.Graphics#drawPolyline
*/
- public void drawPolygon(int xPoints[], int yPoints[],
+ public void drawPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
g.drawPolygon(xPoints, yPoints, nPoints);
}
@@ -709,7 +709,7 @@
* @param nPoints a the total number of points.
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
*/
- public void fillPolygon(int xPoints[], int yPoints[],
+ public void fillPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
g.fillPolygon(xPoints, yPoints, nPoints);
}
@@ -772,7 +772,7 @@
* @see java.awt.Graphics#drawBytes
* @see java.awt.Graphics#drawString
*/
- public void drawChars(char data[], int offset, int length, int x, int y) {
+ public void drawChars(char[] data, int offset, int length, int x, int y) {
g.drawChars(data, offset, length, x, y);
}
@@ -789,7 +789,7 @@
* @see java.awt.Graphics#drawChars
* @see java.awt.Graphics#drawString
*/
- public void drawBytes(byte data[], int offset, int length, int x, int y) {
+ public void drawBytes(byte[] data, int offset, int length, int x, int y) {
g.drawBytes(data, offset, length, x, y);
}
--- a/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -662,7 +662,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since 1.1
*/
- public void drawPolyline(int xPoints[], int yPoints[],
+ public void drawPolyline(int[] xPoints, int[] yPoints,
int nPoints) {
mGraphics.drawPolyline(xPoints, yPoints, nPoints);
}
@@ -687,7 +687,7 @@
* @see java.awt.Graphics#drawPolyline
* @since 1.0
*/
- public void drawPolygon(int xPoints[], int yPoints[],
+ public void drawPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
mGraphics.drawPolygon(xPoints, yPoints, nPoints);
}
@@ -713,7 +713,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since 1.0
*/
- public void fillPolygon(int xPoints[], int yPoints[],
+ public void fillPolygon(int[] xPoints, int[] yPoints,
int nPoints) {
mGraphics.fillPolygon(xPoints, yPoints, nPoints);
}
--- a/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
@@ -554,7 +554,7 @@
MediaSize size = getMediaSize(media, service, page);
Paper paper = new Paper();
- float dim[] = size.getSize(1); //units == 1 to avoid FP error
+ float[] dim = size.getSize(1); //units == 1 to avoid FP error
double w = Math.rint((dim[0]*72.0)/Size2DSyntax.INCH);
double h = Math.rint((dim[1]*72.0)/Size2DSyntax.INCH);
paper.setSize(w, h);
--- a/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/swing/WindowsPlacesBar.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -24,19 +24,36 @@
*/
package sun.swing;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.Color;
+import java.awt.Image;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.*;
+
+import java.io.File;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.filechooser.*;
+import javax.swing.JToolBar;
+import javax.swing.JFileChooser;
+import javax.swing.JToggleButton;
+import javax.swing.ButtonGroup;
+import javax.swing.UIManager;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.Box;
-import sun.awt.shell.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.BevelBorder;
+import javax.swing.filechooser.FileSystemView;
+
+import sun.awt.shell.ShellFolder;
import sun.awt.OSInfo;
/**
@@ -81,7 +98,7 @@
setBackground(bgColor);
FileSystemView fsv = fc.getFileSystemView();
- files = (File[]) ShellFolder.get("fileChooserShortcutPanelFolders");
+ files = fsv.getChooserShortcutPanelFiles();
buttons = new JToggleButton[files.length];
buttonGroup = new ButtonGroup();
--- a/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -111,7 +111,7 @@
* Updates the UIs of all the known Frames.
*/
protected void updateAllUIs() {
- Frame appFrames[] = Frame.getFrames();
+ Frame[] appFrames = Frame.getFrames();
for (Frame appFrame : appFrames) {
updateWindowUI(appFrame);
}
@@ -122,7 +122,7 @@
*/
private static void updateWindowUI(Window window) {
SwingUtilities.updateComponentTreeUI(window);
- Window ownedWins[] = window.getOwnedWindows();
+ Window[] ownedWins = window.getOwnedWindows();
for (Window ownedWin : ownedWins) {
updateWindowUI(ownedWin);
}
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c Wed Oct 24 13:35:18 2018 +0530
@@ -38,6 +38,7 @@
#include FT_SIZES_H
#include FT_OUTLINE_H
#include FT_SYNTHESIS_H
+#include FT_LCD_FILTER_H
#include "fontscaler.h"
@@ -397,6 +398,8 @@
if (errCode == 0) {
errCode = FT_Activate_Size(scalerInfo->face->size);
}
+
+ FT_Library_SetLcdFilter(scalerInfo->library, FT_LCD_FILTER_DEFAULT);
}
return errCode;
--- a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, 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
@@ -168,7 +168,7 @@
}
// We need to have at least gtk.icon.<stock_id>.<size>.<orientation>
- String str[] = longname.split("\\.");
+ String[] str = longname.split("\\.");
if (str.length != 5) {
return null;
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -576,7 +576,7 @@
return false;
}
- private void paintVSB(Graphics g, Color colors[], Rectangle bounds) {
+ private void paintVSB(Graphics g, Color[] colors, Rectangle bounds) {
int height = bounds.height - 2*BORDER_WIDTH - (hsbVis ? (SCROLLBAR_WIDTH-2) : 0);
Graphics ng = g.create();
@@ -592,7 +592,7 @@
}
}
- private void paintHSB(Graphics g, Color colors[], Rectangle bounds) {
+ private void paintHSB(Graphics g, Color[] colors, Rectangle bounds) {
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -420,7 +420,7 @@
}
BufferedReader bfr = new BufferedReader(new FileReader(pFile));
- int colors[] = new int[8];
+ int[] colors = new int[8];
int r,g,b;
String temp,color;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -99,7 +99,7 @@
ColorUIResource controlDarker = new ColorUIResource(SystemColor.controlDkShadow);
Color back = table.getColor("control");
- Color colors [] = XComponentPeer.getSystemColors();
+ Color[] colors = XComponentPeer.getSystemColors();
Color scrollBarBackground = colors[XComponentPeer.BACKGROUND_COLOR];
Color trackColor = new Color(MotifColorUtilities.calculateSelectFromBackground(scrollBarBackground.getRed(), scrollBarBackground.getGreen(), scrollBarBackground.getBlue()));
Border loweredBevelBorder = new MotifBorders.BevelBorder(false,
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -151,7 +151,7 @@
if (log.isLoggable(PlatformLogger.Level.FINE)) {
log.fine("noItems = " + getter.getNumberOfItems());
}
- byte array[] = Native.toBytes(ptr,getter.getNumberOfItems());
+ byte[] array = Native.toBytes(ptr,getter.getNumberOfItems());
if (array != null) {
settings = update(array);
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -941,7 +941,7 @@
static void checkSecurity() {
if (XToolkit.isSecurityWarningEnabled() && XToolkit.isToolkitThread()) {
- StackTraceElement stack[] = (new Throwable()).getStackTrace();
+ StackTraceElement[] stack = (new Throwable()).getStackTrace();
log.warning(stack[1] + ": Security violation: calling user code on toolkit thread");
}
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -25,9 +25,29 @@
package sun.awt.X11;
-import java.awt.*;
-import java.awt.peer.*;
-import java.awt.event.*;
+import java.awt.Color;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.FontMetrics;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.Choice;
+import java.awt.Toolkit;
+import java.awt.Graphics;
+import java.awt.Component;
+import java.awt.AWTEvent;
+import java.awt.Insets;
+import java.awt.Font;
+
+import java.awt.peer.ChoicePeer;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.InvocationEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.ItemEvent;
+
import sun.util.logging.PlatformLogger;
// FIXME: tab traversal should be disabled when mouse is captured (4816336)
@@ -228,12 +248,14 @@
helper.down();
int newIdx = helper.getSelectedIndex();
- ((Choice)target).select(newIdx);
- postEvent(new ItemEvent((Choice)target,
- ItemEvent.ITEM_STATE_CHANGED,
- ((Choice)target).getItem(newIdx),
- ItemEvent.SELECTED));
- repaint();
+ if (((Choice)target).getSelectedIndex() != newIdx) {
+ ((Choice)target).select(newIdx);
+ postEvent(new ItemEvent((Choice)target,
+ ItemEvent.ITEM_STATE_CHANGED,
+ ((Choice)target).getItem(newIdx),
+ ItemEvent.SELECTED));
+ repaint();
+ }
}
break;
}
@@ -243,12 +265,14 @@
helper.up();
int newIdx = helper.getSelectedIndex();
- ((Choice)target).select(newIdx);
- postEvent(new ItemEvent((Choice)target,
- ItemEvent.ITEM_STATE_CHANGED,
- ((Choice)target).getItem(newIdx),
- ItemEvent.SELECTED));
- repaint();
+ if (((Choice)target).getSelectedIndex() != newIdx) {
+ ((Choice)target).select(newIdx);
+ postEvent(new ItemEvent((Choice)target,
+ ItemEvent.ITEM_STATE_CHANGED,
+ ((Choice)target).getItem(newIdx),
+ ItemEvent.SELECTED));
+ repaint();
+ }
}
break;
}
@@ -293,11 +317,13 @@
helper.select(dragStartIdx);
} else { //KeyEvent.VK_ENTER:
int newIdx = helper.getSelectedIndex();
- ((Choice)target).select(newIdx);
- postEvent(new ItemEvent((Choice)target,
- ItemEvent.ITEM_STATE_CHANGED,
- ((Choice)target).getItem(newIdx),
- ItemEvent.SELECTED));
+ if (newIdx != (((Choice)target).getSelectedIndex())) {
+ ((Choice)target).select(newIdx);
+ postEvent(new ItemEvent((Choice)target,
+ ItemEvent.ITEM_STATE_CHANGED,
+ ((Choice)target).getItem(newIdx),
+ ItemEvent.SELECTED));
+ }
}
}
hidePopdownMenu();
@@ -457,8 +483,10 @@
* We should generate ItemEvent if only
* LeftMouseButton used */
if (e.getButton() == MouseEvent.BUTTON1 &&
- (!firstPress || wasDragged ))
+ (!firstPress || wasDragged ) &&
+ ((Choice)target).getSelectedIndex() != newIdx)
{
+ ((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),
@@ -945,7 +973,7 @@
public void paintPeer(Graphics g) {
//System.out.println("UC.paint()");
Choice choice = (Choice)target;
- Color colors[] = XChoicePeer.this.getGUIcolors();
+ Color[] colors = XChoicePeer.this.getGUIcolors();
draw3DRect(g, getSystemColors(), 0, 0, width - 1, height - 1, true);
draw3DRect(g, getSystemColors(), 1, 1, width - 3, height - 3, true);
--- a/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -773,7 +773,7 @@
static int[] getRGBvals(Color c) {
- int rgbvals[] = new int[3];
+ int[] rgbvals = new int[3];
rgbvals[0] = c.getRed();
rgbvals[1] = c.getGreen();
@@ -788,7 +788,7 @@
static final int FOREGROUND_COLOR = 3;
public Color[] getGUIcolors() {
- Color c[] = new Color[4];
+ Color[] c = new Color[4];
float backb, highb, shadowb, hue, saturation;
c[BACKGROUND_COLOR] = getWinBackground();
if (c[BACKGROUND_COLOR] == null) {
@@ -907,7 +907,7 @@
/**
* Draw a 3D oval.
*/
- public void draw3DOval(Graphics g, Color colors[],
+ public void draw3DOval(Graphics g, Color[] colors,
int x, int y, int w, int h, boolean raised)
{
Color c = g.getColor();
@@ -918,7 +918,7 @@
g.setColor(c);
}
- public void draw3DRect(Graphics g, Color colors[],
+ public void draw3DRect(Graphics g, Color[] colors,
int x, int y, int width, int height, boolean raised)
{
Color c = g.getColor();
@@ -974,8 +974,8 @@
int v1 = thickness + (int)(f * (val - min));
int v2 = (int)(f * vis);
int w2 = thickness-4;
- int tpts_x[] = new int[3];
- int tpts_y[] = new int[3];
+ int[] tpts_x = new int[3];
+ int[] tpts_y = new int[3];
if (length < 3*w2 ) {
v1 = v2 = 0;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XConstants.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -204,7 +204,7 @@
and ButtonRelease events. Not to be confused with button masks above.
Note that 0 is already defined above as "AnyButton". */
- public static final int buttons [] = new int [] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
+ public static final int[] buttons = new int [] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
/* Notify modes */
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -55,12 +55,12 @@
int accel_key, accel_keysym, accel_mods;
static Rectangle initialBounds = new Rectangle(0, 0, 100, 100);
Robot robot;
- Rectangle serverBounds[]; // first rectangle is for the server frame, second is for dummy frame, others are for its children
+ Rectangle[] serverBounds; // first rectangle is for the server frame, second is for dummy frame, others are for its children
private static final int SERVER_BOUNDS = 0, OTHER_FRAME = 1, SERVER_FOCUS = 2, SERVER_MODAL = 3, MODAL_CLOSE = 4;
LinkedList<Integer> events = new LinkedList<Integer>();
- private XEmbedServerTester(Rectangle serverBounds[], long parent) {
+ private XEmbedServerTester(Rectangle[] serverBounds, long parent) {
this.parent = parent;
focusedKind = -1;
focusedServerComponent = -1;
@@ -86,7 +86,7 @@
}
}
- public static XEmbedServerTester getTester(Rectangle serverBounds[], long parent) {
+ public static XEmbedServerTester getTester(Rectangle[] serverBounds, long parent) {
return new XEmbedServerTester(serverBounds, parent);
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -467,7 +467,7 @@
} else {
setFilterField(f);
}
- String l[];
+ String[] l;
if (f.equals("*")) {
l = fe.list();
@@ -824,7 +824,7 @@
* See 6240074 for more information
*/
public void addItemsToPathChoice(String text){
- String dirList[] = getDirList(text);
+ String[] dirList = getDirList(text);
for (int i = 0; i < dirList.length; i++) pathChoice.addItem(dirList[i]);
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,7 +1,7 @@
// This is a generated file: do not edit! Edit keysym2ucs.h if necessary.
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -33,7 +33,7 @@
public class XKeysym {
- public static void main( String args[] ) {
+ public static void main( String[] args ) {
System.out.println( "Cyrillc zhe:"+convertKeysym(0x06d6, 0));
System.out.println( "Arabic sheen:"+convertKeysym(0x05d4, 0));
System.out.println( "Latin a breve:"+convertKeysym(0x01e3, 0));
--- a/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -76,7 +76,7 @@
// Holds the array of the indexes of the elements which is selected
// This array should be kept sorted, low to high.
- int selected[];
+ int[] selected;
int fontHeight;
int fontAscent;
int fontLeading;
@@ -174,7 +174,7 @@
maxLength = maxLength();
// get the index containing all indexes to selected items
- int sel[] = l.getSelectedIndexes();
+ int[] sel = l.getSelectedIndexes();
selected = new int[sel.length];
// TODO: shouldn't this be arraycopy()?
for (int i = 0 ; i < sel.length ; i ++) {
@@ -1147,7 +1147,7 @@
items.removeElementAt(s);
int j = posInSel(i);
if (j != -1) {
- int newsel[] = new int[selected.length - 1];
+ int[] newsel = new int[selected.length - 1];
System.arraycopy(selected, 0, newsel, 0, j);
System.arraycopy(selected, j + 1, newsel, j, selected.length - (j + 1));
selected = newsel;
@@ -1246,7 +1246,7 @@
}
} else {
// insert "index" into the selection array
- int newsel[] = new int[selected.length + 1];
+ int[] newsel = new int[selected.length + 1];
int i = 0;
while (i < selected.length && index > selected[i]) {
newsel[i] = selected[i];
@@ -1284,7 +1284,7 @@
selected = new int[0];
} else {
int i = posInSel(index);
- int newsel[] = new int[selected.length - 1];
+ int[] newsel = new int[selected.length - 1];
System.arraycopy(selected, 0, newsel, 0, i);
System.arraycopy(selected, i+1, newsel, i, selected.length - (i+1));
selected = newsel;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -63,10 +63,10 @@
Vector<XMSelectionListener> listeners;
/* X atom array (one per screen) for this selection */
- XAtom atoms[];
+ XAtom[] atoms;
/* Window ids of selection owners */
- long owners[];
+ long[] owners;
/* event mask to set */
long eventMask;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -287,7 +287,7 @@
item.map(bounds, textOrigin);
}
}
- XMenuItemPeer mappedVector[] = new XMenuItemPeer[mappedCnt];
+ XMenuItemPeer[] mappedVector = new XMenuItemPeer[mappedCnt];
System.arraycopy(itemVector, 0, mappedVector, 0, mappedCnt);
MappingData mappingData = new MappingData(mappedVector, BAR_SPACING_TOP + itemHeight + BAR_SPACING_BOTTOM);
return mappingData;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -106,14 +106,14 @@
@Override
public int getRGBPixel(int x, int y) {
- int pixelArray[] = new int[1];
+ int[] pixelArray = new int[1];
getRGBPixelsImpl(xgc, x, y, 1, 1, pixelArray, useGtk);
return pixelArray[0];
}
@Override
public int [] getRGBPixels(Rectangle bounds) {
- int pixelArray[] = new int[bounds.width*bounds.height];
+ int[] pixelArray = new int[bounds.width*bounds.height];
getRGBPixelsImpl(xgc, bounds.x, bounds.y, bounds.width, bounds.height,
pixelArray, useGtk);
return pixelArray;
@@ -131,5 +131,5 @@
private static synchronized native void keyReleaseImpl(int keycode);
private static synchronized native void getRGBPixelsImpl(X11GraphicsConfig xgc,
- int x, int y, int width, int height, int pixelArray[], boolean isGtkSupported);
+ int x, int y, int width, int height, int[] pixelArray, boolean isGtkSupported);
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -279,7 +279,7 @@
return;
}
int sx, sy;
- Color colors[] = getGUIcolors();
+ Color[] colors = getGUIcolors();
if (sp.getScrollbarDisplayPolicy() == ScrollPane.SCROLLBARS_NEVER) {
sx = -x;
@@ -353,7 +353,7 @@
}
void repaintScrollBars() {
Graphics g = getGraphics();
- Color colors[] = getGUIcolors();
+ Color[] colors = getGUIcolors();
if (g != null) {
try {
paintScrollBars(g, colors);
@@ -364,7 +364,7 @@
}
public void repaintScrollbarRequest(XScrollbar sb) {
Graphics g = getGraphics();
- Color colors[] = getGUIcolors();
+ Color[] colors = getGUIcolors();
if (g != null) {
try {
if (sb == vsb) {
@@ -397,7 +397,7 @@
* @param colors the colors used to draw the scrollbar
* @param paintAll paint the whole scrollbar if true, just the thumb if false
*/
- void paintHorScrollbar(Graphics g, Color colors[], boolean paintAll) {
+ void paintHorScrollbar(Graphics g, Color[] colors, boolean paintAll) {
if (hsbSpace <= 0) {
return;
}
@@ -433,7 +433,7 @@
* @param colors the colors used to draw the scrollbar
* @param paintAll paint the whole scrollbar if true, just the thumb if false
*/
- void paintVerScrollbar(Graphics g, Color colors[], boolean paintAll) {
+ void paintVerScrollbar(Graphics g, Color[] colors, boolean paintAll) {
if (vsbSpace <= 0) {
return;
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -163,7 +163,7 @@
* @param colors the colors to use when painting the scrollbar
* @param paintAll paint the whole scrollbar if true, just the thumb is false
*/
- void paint(Graphics g, Color colors[], boolean paintAll) {
+ void paint(Graphics g, Color[] colors, boolean paintAll) {
if (log.isLoggable(PlatformLogger.Level.FINER)) {
log.finer("Painting scrollbar " + this);
}
--- a/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -117,7 +117,7 @@
}
long tray_window = tiPeer.getWindow();
- long data[] = new long[] {XEmbedHelper.XEMBED_VERSION, XEmbedHelper.XEMBED_MAPPED};
+ long[] data = new long[] {XEmbedHelper.XEMBED_VERSION, XEmbedHelper.XEMBED_MAPPED};
long data_ptr = Native.card32ToData(data);
_XEMBED_INFO.setAtomData(tray_window, data_ptr, data.length);
--- a/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java Wed Oct 24 13:35:18 2018 +0530
@@ -418,7 +418,7 @@
if (!GraphicsEnvironment.isHeadless()) {
String mainClassName = null;
- StackTraceElement trace[] = (new Throwable()).getStackTrace();
+ StackTraceElement[] trace = (new Throwable()).getStackTrace();
int bottom = trace.length - 1;
if (bottom >= 0) {
mainClassName = trace[bottom].getClassName();
@@ -1949,7 +1949,7 @@
final int shiftLock = keysymToPrimaryKeycode(XKeySymConstants.XK_Shift_Lock);
final int capsLock = keysymToPrimaryKeycode(XKeySymConstants.XK_Caps_Lock);
- final int modmask[] = { XConstants.ShiftMask, XConstants.LockMask, XConstants.ControlMask, XConstants.Mod1Mask,
+ final int[] modmask = { XConstants.ShiftMask, XConstants.LockMask, XConstants.ControlMask, XConstants.Mod1Mask,
XConstants.Mod2Mask, XConstants.Mod3Mask, XConstants.Mod4Mask, XConstants.Mod5Mask };
log.fine("In setupModifierMap");
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWM.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWM.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -625,7 +625,7 @@
* Gaa, dirty dances...
*/
static final XAtom XA_ICEWM_WINOPTHINT = new XAtom("_ICEWM_WINOPTHINT", false);
- static final char opt[] = {
+ static final char[] opt = {
'A','W','T','_','I','C','E','W','M','_','T','E','S','T','\0',
'a','l','l','W','o','r','k','s','p','a','c','e','s','\0',
'0','\0'
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindow.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -1093,7 +1093,7 @@
// called directly from this package, unlike handleKeyRelease.
// un-final it if you need to override it in a subclass.
final void handleKeyPress(XKeyEvent ev) {
- long keysym[] = new long[2];
+ long[] keysym = new long[2];
int unicodeKey = 0;
keysym[0] = XConstants.NoSymbol;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -675,7 +675,7 @@
int largestAmt = 0;
int curScreenNum = ((X11GraphicsDevice)getGraphicsConfiguration().getDevice()).getScreen();
int newScreenNum = 0;
- GraphicsDevice gds[] = XToolkit.localEnv.getScreenDevices();
+ GraphicsDevice[] gds = XToolkit.localEnv.getScreenDevices();
GraphicsConfiguration newGC = null;
Rectangle screenBounds;
--- a/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -61,7 +61,7 @@
}
}
- int tmp[] = new int[pixels.length];
+ int[] tmp = new int[pixels.length];
for (int i=0; i<pixels.length; i++) {
if ((pixels[i] & 0xff000000) == 0) {
tmp[i] = -1;
@@ -73,7 +73,7 @@
int fc = 0x000000;
int bc = 0xffffff;
- CCount cols[] = new CCount[pixels.length];
+ CCount[] cols = new CCount[pixels.length];
int is = 0;
int numColors = 0;
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -244,7 +244,7 @@
Boolean result = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Boolean>() {
public Boolean run() {
- InetAddress remAddr[] = null;
+ InetAddress[] remAddr = null;
Enumeration<InetAddress> locals = null;
Enumeration<NetworkInterface> interfaces = null;
try {
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethod.java Wed Oct 24 13:35:18 2018 +0530
@@ -175,7 +175,7 @@
// to insure that it cannot be overridden by client subclasses.
// DO NOT INVOKE CLIENT CODE ON THIS THREAD!
void dispatchComposedText(String chgText,
- int chgStyles[],
+ int[] chgStyles,
int chgOffset,
int chgLength,
int caretPosition,
--- a/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java Wed Oct 24 13:35:18 2018 +0530
@@ -127,7 +127,7 @@
// Initialize highlight mapping table
static {
@SuppressWarnings({"unchecked", "rawtypes"})
- Map<TextAttribute, ?> styles[] = new Map[4];
+ Map<TextAttribute, ?>[] styles = new Map[4];
HashMap<TextAttribute, Object> map;
// UNSELECTED_RAW_TEXT_HIGHLIGHT
@@ -490,7 +490,7 @@
// to insure that it cannot be overridden by client subclasses.
// DO NOT INVOKE CLIENT CODE ON THIS THREAD!
abstract void dispatchComposedText(String chgText,
- int chgStyles[],
+ int[] chgStyles,
int chgOffset,
int chgLength,
int caretPosition,
--- a/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -39,8 +39,8 @@
extends CharsetEncoder
{
- private short index1[];
- private String index2[];
+ private short[] index1;
+ private String[] index2;
private final Surrogate.Parser sgp = new Surrogate.Parser();
--- a/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/font/X11GB18030_0.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -4234,7 +4234,7 @@
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private static final short index1[] = {
+ private static final short[] index1 = {
1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 13, 14,
@@ -4253,7 +4253,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 127, 0, 0, 0, 128, 129
};
- private static final String index2[] = {
+ private static final String[] index2 = {
innerIndex0,
innerIndex1,
innerIndex2,
--- a/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/font/X11GB18030_1.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -5229,7 +5229,7 @@
"\u99EC\u99ED\u99EE\u99EF\u99F0\u99F1\u99F2\u99F3"+
"\u99F4\u99F5\u99F6\u99F7\u99F8\u0000\u99FA\u99FB";
- private static final short index1[] = {
+ private static final short[] index1 = {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
@@ -5248,7 +5248,7 @@
145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160
};
- private static final String index2[] = {
+ private static final String[] index2 = {
innerIndex0,
innerIndex1,
innerIndex2,
--- a/src/java.desktop/unix/classes/sun/font/X11Johab.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/font/X11Johab.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -4747,7 +4747,7 @@
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private static final short index1[] = {
+ private static final short[] index1 = {
1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -4766,7 +4766,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 143, 144, 0, 0, 0, 0, 145
};
- private static String index2[] = {
+ private static String[] index2 = {
innerIndex0,
innerIndex1,
innerIndex2,
--- a/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, 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
@@ -121,7 +121,7 @@
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"+
"\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000";
- private static final short index1[] = {
+ private static final short[] index1 = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -140,7 +140,7 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
- private static final String index2[] = {
+ private static final String[] index2 = {
innerIndex0
};
--- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -105,7 +105,7 @@
}
long cfginfo = 0;
- final String ids[] = new String[1];
+ final String[] ids = new String[1];
OGLRenderQueue rq = OGLRenderQueue.getInstance();
rq.lock();
try {
--- a/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -170,7 +170,7 @@
int npoints, boolean isclosed);
public void drawPolyline(SunGraphics2D sg2d,
- int xpoints[], int ypoints[],
+ int[] xpoints, int[] ypoints,
int npoints)
{
SunToolkit.awtLock();
@@ -185,7 +185,7 @@
}
public void drawPolygon(SunGraphics2D sg2d,
- int xpoints[], int ypoints[],
+ int[] xpoints, int[] ypoints,
int npoints)
{
SunToolkit.awtLock();
@@ -275,7 +275,7 @@
int npoints);
public void fillPolygon(SunGraphics2D sg2d,
- int xpoints[], int ypoints[],
+ int[] xpoints, int[] ypoints,
int npoints)
{
SunToolkit.awtLock();
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -108,7 +108,7 @@
GradientPaint paint = (GradientPaint) pt;
int repeat = paint.isCyclic() ? XRUtils.RepeatReflect : XRUtils.RepeatPad;
- float fractions[] = {0, 1};
+ float[] fractions = {0, 1};
int[] pixels = convertToIntArgbPixels(new Color[] { paint.getColor1(), paint.getColor2() });
Point2D pt1 = paint.getPoint1();
--- a/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, 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
@@ -106,7 +106,7 @@
}
public void drawPolyline(SunGraphics2D sg2d,
- int xpoints[], int ypoints[], int npoints) {
+ int[] xpoints, int[] ypoints, int npoints) {
Path2D.Float p2d = new Path2D.Float();
if (npoints > 1) {
p2d.moveTo(xpoints[0], ypoints[0]);
@@ -119,7 +119,7 @@
}
public void drawPolygon(SunGraphics2D sg2d,
- int xpoints[], int ypoints[], int npoints) {
+ int[] xpoints, int[] ypoints, int npoints) {
draw(sg2d, new Polygon(xpoints, ypoints, npoints));
}
@@ -163,7 +163,7 @@
}
public void fillPolygon(SunGraphics2D sg2d,
- int xpoints[], int ypoints[], int npoints) {
+ int[] xpoints, int[] ypoints, int npoints) {
fill(sg2d, new Polygon(xpoints, ypoints, npoints));
}
--- a/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -269,7 +269,7 @@
static String[] getDefaultPrinter() {
// Try to get user/lpoptions-defined printer name from CUPS
// if not user-set, then go for server default destination
- String printerInfo[] = new String[2];
+ String[] printerInfo = new String[2];
printerInfo[0] = getCupsDefaultPrinter();
if (printerInfo[0] != null) {
@@ -298,7 +298,7 @@
return null;
}
- AttributeClass attCl[] = {
+ AttributeClass[] attCl = {
AttributeClass.ATTRIBUTES_CHARSET,
AttributeClass.ATTRIBUTES_NATURAL_LANGUAGE,
new AttributeClass("requested-attributes",
@@ -397,7 +397,7 @@
return null;
}
- AttributeClass attCl[] = {
+ AttributeClass[] attCl = {
AttributeClass.ATTRIBUTES_CHARSET,
AttributeClass.ATTRIBUTES_NATURAL_LANGUAGE,
new AttributeClass("requested-attributes",
--- a/src/java.desktop/unix/classes/sun/print/IPPPrintService.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/print/IPPPrintService.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -581,7 +581,7 @@
} else if (category == JobName.class) {
return new JobName("Java Printing", null);
} else if (category == JobSheets.class) {
- JobSheets arr[] = new JobSheets[2];
+ JobSheets[] arr = new JobSheets[2];
arr[0] = JobSheets.NONE;
arr[1] = JobSheets.STANDARD;
return arr;
@@ -1758,11 +1758,11 @@
try {
debug_println(debugPrefix+"opGetAttributes myURI "+myURI+" myURL "+myURL);
- AttributeClass attClNoUri[] = {
+ AttributeClass[] attClNoUri = {
AttributeClass.ATTRIBUTES_CHARSET,
AttributeClass.ATTRIBUTES_NATURAL_LANGUAGE};
- AttributeClass attCl[] = {
+ AttributeClass[] attCl = {
AttributeClass.ATTRIBUTES_CHARSET,
AttributeClass.ATTRIBUTES_NATURAL_LANGUAGE,
new AttributeClass("printer-uri",
@@ -1884,7 +1884,7 @@
return null;
}
- byte response[] = new byte[MAX_ATTRIBUTE_LENGTH];
+ byte[] response = new byte[MAX_ATTRIBUTE_LENGTH];
try {
DataInputStream ois = new DataInputStream(inputStream);
@@ -1931,7 +1931,7 @@
outObj.write(counter);
outObj.flush();
outObj.close();
- byte outArray[] = outObj.toByteArray();
+ byte[] outArray = outObj.toByteArray();
// if key exists, new HashMap
if (responseMap.containsKey(attribStr)) {
@@ -1995,7 +1995,7 @@
responseMap = new HashMap<>();
}
- byte outArray[] = outObj.toByteArray();
+ byte[] outArray = outObj.toByteArray();
AttributeClass ac =
new AttributeClass(attribStr,
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -860,7 +860,7 @@
int COPIES = 0x8;
int NOSHEET = 0x10;
int pFlags = 0;
- String execCmd[];
+ String[] execCmd;
int ncomps = 2; // minimum number of print args
int n = 0;
@@ -1022,7 +1022,7 @@
* Spool to the printer.
*/
String fileName = spoolFile.getAbsolutePath();
- String execCmd[] = printExecCmd(mDestination, mOptions,
+ String[] execCmd = printExecCmd(mDestination, mOptions,
mNoJobSheet, jobName, copies, fileName);
Process process = Runtime.getRuntime().exec(execCmd);
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintService.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintService.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -179,7 +179,7 @@
private static int MAXCOPIES = 1000;
- private static final MediaSizeName mediaSizes[] = {
+ private static final MediaSizeName[] mediaSizes = {
MediaSizeName.NA_LETTER,
MediaSizeName.TABLOID,
MediaSizeName.LEDGER,
@@ -224,7 +224,7 @@
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsSysV() {
String command = "/usr/bin/lpstat -a " + printer;
- String results[]= PrintServiceLookupProvider.execCmd(command);
+ String[] results= PrintServiceLookupProvider.execCmd(command);
if (results != null && results.length > 0) {
if (results[0].startsWith(printer + " accepting requests")) {
@@ -257,7 +257,7 @@
String command = "/usr/sbin/lpc status " + printer
+ lpcStatusCom[PrintServiceLookupProvider.cmdIndex];
- String results[]= PrintServiceLookupProvider.execCmd(command);
+ String[] results= PrintServiceLookupProvider.execCmd(command);
if (results != null && results.length > 0) {
if (PrintServiceLookupProvider.cmdIndex ==
@@ -305,7 +305,7 @@
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsAIX() {
// On AIX there should not be a blank after '-a'.
String command = "/usr/bin/lpstat -a" + printer;
- String results[]= PrintServiceLookupProvider.execCmd(command);
+ String[] results= PrintServiceLookupProvider.execCmd(command);
// Remove headers and bogus entries added by remote printers.
results = filterPrinterNamesAIX(results);
@@ -355,7 +355,7 @@
private QueuedJobCount getQueuedJobCountSysV() {
String command = "/usr/bin/lpstat -R " + printer;
- String results[]= PrintServiceLookupProvider.execCmd(command);
+ String[] results= PrintServiceLookupProvider.execCmd(command);
int qlen = (results == null) ? 0 : results.length;
return new QueuedJobCount(qlen);
@@ -372,7 +372,7 @@
int qlen = 0;
String command = "/usr/sbin/lpc status " + printer
+ lpcQueueCom[PrintServiceLookupProvider.cmdIndex];
- String results[] = PrintServiceLookupProvider.execCmd(command);
+ String[] results = PrintServiceLookupProvider.execCmd(command);
if (results != null && results.length > 0) {
String queued;
@@ -400,7 +400,7 @@
private QueuedJobCount getQueuedJobCountAIX() {
// On AIX there should not be a blank after '-a'.
String command = "/usr/bin/lpstat -a" + printer;
- String results[]= PrintServiceLookupProvider.execCmd(command);
+ String[] results= PrintServiceLookupProvider.execCmd(command);
// Remove headers and bogus entries added by remote printers.
results = filterPrinterNamesAIX(results);
@@ -794,7 +794,7 @@
} else if (category == JobName.class) {
return new JobName("Java Printing", null);
} else if (category == JobSheets.class) {
- JobSheets arr[] = new JobSheets[2];
+ JobSheets[] arr = new JobSheets[2];
arr[0] = JobSheets.NONE;
arr[1] = JobSheets.STANDARD;
return arr;
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c Wed Oct 24 13:35:18 2018 +0530
@@ -1123,6 +1123,7 @@
tmpstyle[cnt] = text->feedback[cnt];
(*env)->SetIntArrayRegion(env, style, 0,
text->length, (jint *)tmpstyle);
+ free(tmpstyle);
}
}
}
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c Wed Oct 24 13:35:18 2018 +0530
@@ -183,6 +183,7 @@
detail_str = (char *)SAFE_SIZE_ARRAY_ALLOC(malloc,
sizeof(char), len + 1);
if (detail_str == NULL) {
+ free(stock_id_str);
JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError");
return JNI_FALSE;
}
@@ -190,6 +191,10 @@
}
if (!init_method(env, this) ) {
+ free(stock_id_str);
+ if (detail_str != NULL) {
+ free(detail_str);
+ }
return JNI_FALSE;
}
jboolean result = gtk->get_icon_data(env, widget_type, stock_id_str,
--- a/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c Wed Oct 24 13:35:18 2018 +0530
@@ -66,6 +66,9 @@
NativeScalerContext *context =
(NativeScalerContext*)malloc(sizeof(NativeScalerContext));
+ if (context == NULL) {
+ return (jlong)(uintptr_t)0L;
+ }
context->xFont = NULL;
context->minGlyph = 0;
context->maxGlyph = 0;
@@ -92,6 +95,10 @@
(*env)->GetByteArrayRegion(env, xlfdBytes, 0, len, (jbyte*)xlfd);
xlfd[len] = '\0';
context = (NativeScalerContext*)malloc(sizeof(NativeScalerContext));
+ if (context == NULL) {
+ free(xlfd);
+ return (jlong)(uintptr_t)0L;
+ }
AWTLoadFont (xlfd, &(context->xFont));
free(xlfd);
@@ -232,10 +239,15 @@
Java_sun_font_NativeFont_getGlyphAdvance
(JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) {
- NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
- AWTFont xFont = (AWTFont)context->xFont;
AWTChar xcs = NULL;
jfloat advance = 0.0f;
+ AWTFont xFont;
+ NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
+ if (context == NULL) {
+ return advance;
+ } else {
+ xFont = (AWTFont)context->xFont;
+ }
if (xFont == NULL || context->ptSize == NO_POINTSIZE) {
return advance;
@@ -271,9 +283,14 @@
Java_sun_font_NativeFont_getGlyphImageNoDefault
(JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) {
+ AWTChar2b xChar;
+ AWTFont xFont;
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
- AWTFont xFont = context->xFont;
- AWTChar2b xChar;
+ if (context == NULL) {
+ return (jlong)0;
+ } else {
+ xFont = (AWTFont)context->xFont;
+ }
if (xFont == NULL || context->ptSize == NO_POINTSIZE) {
return (jlong)0;
@@ -292,9 +309,14 @@
Java_sun_font_NativeFont_getGlyphImage
(JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) {
+ AWTChar2b xChar;
+ AWTFont xFont;
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
- AWTFont xFont = context->xFont;
- AWTChar2b xChar;
+ if (context == NULL) {
+ return (jlong)0;
+ } else {
+ xFont = (AWTFont)context->xFont;
+ }
if (xFont == NULL || context->ptSize == NO_POINTSIZE) {
return (jlong)0;
@@ -313,10 +335,15 @@
Java_sun_font_NativeFont_getFontMetrics
(JNIEnv *env, jobject font2D, jlong pScalerContext) {
- NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
- AWTFont xFont = (AWTFont)context->xFont;
jfloat j0=0, j1=1, ay=j0, dy=j0, mx=j0;
jobject metrics;
+ AWTFont xFont;
+ NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
+ if (context == NULL) {
+ return NULL;
+ } else {
+ xFont = (AWTFont)context->xFont;
+ }
if (xFont == NULL) {
return NULL;
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -154,7 +154,7 @@
comboBox.addMouseListener(rolloverListener);
arrowButton.addMouseListener(rolloverListener);
// set empty border as default to see vista animated border
- comboBox.setBorder(new EmptyBorder(0,0,0,0));
+ comboBox.setBorder(new EmptyBorder(1,1,1,1));
}
}
@@ -366,12 +366,20 @@
if (XPStyle.getXP() != null && arrowButton != null) {
Dimension d = parent.getSize();
Insets insets = getInsets();
- int buttonWidth = arrowButton.getPreferredSize().width;
- arrowButton.setBounds(WindowsGraphicsUtils.isLeftToRight((JComboBox)parent)
- ? (d.width - insets.right - buttonWidth)
- : insets.left,
- insets.top,
- buttonWidth, d.height - insets.top - insets.bottom);
+
+ int borderInsetsCorrection = 0;
+ if (((JComboBox)parent).getBorder() instanceof EmptyBorder) {
+ borderInsetsCorrection = 1;
+ }
+ arrowButton.setBounds(
+ WindowsGraphicsUtils.isLeftToRight((JComboBox)parent)
+ ? (d.width - (insets.right - borderInsetsCorrection)
+ - arrowButton.getPreferredSize().width)
+ : insets.left - borderInsetsCorrection,
+ insets.top - borderInsetsCorrection,
+ arrowButton.getPreferredSize().width,
+ d.height - (insets.top - borderInsetsCorrection) -
+ (insets.bottom - borderInsetsCorrection));
}
}
};
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -672,8 +672,8 @@
"ComboBox.buttonHighlight", ControlHighlightColor,
"ComboBox.selectionBackground", SelectionBackgroundColor,
"ComboBox.selectionForeground", SelectionTextColor,
- "ComboBox.editorBorder", new XPValue(new EmptyBorder(1,4,1,1),
- new EmptyBorder(1,4,1,4)),
+ "ComboBox.editorBorder", new XPValue(new EmptyBorder(1,3,1,1),
+ new EmptyBorder(1,3,1,4)),
"ComboBox.disabledBackground",
new XPColorValue(Part.CP_COMBOBOX, State.DISABLED,
Prop.FILLCOLOR, DisabledTextBackground),
@@ -1587,7 +1587,7 @@
"CheckBoxMenuItem", "RadioButtonMenuItem",
};
- Object menuDefaults[] = new Object[menuClasses.length * 2];
+ Object[] menuDefaults = new Object[menuClasses.length * 2];
/* all the menus need to be non opaque. */
for (int i = 0, j = 0; i < menuClasses.length; i++) {
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -142,7 +142,7 @@
if (menu != null) {
MenuSelectionManager msm =
MenuSelectionManager.defaultManager();
- MenuElement path[] = new MenuElement[2];
+ MenuElement[] path = new MenuElement[2];
path[0] = (MenuElement)menuBar;
path[1] = (MenuElement)menu;
msm.setSelectedPath(path);
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -165,11 +165,13 @@
}
public boolean postProcessKeyEvent(KeyEvent ev) {
- if(ev.isConsumed() && ev.getKeyCode() != KeyEvent.VK_ALT) {
- // mnemonic combination, it's consumed, but we need
- // set altKeyPressed to false, otherwise after selection
- // component by mnemonic combination a menu will be open
- altKeyPressed = false;
+ if (ev.isConsumed()) {
+ if (ev.getKeyCode() != KeyEvent.VK_ALT) {
+ // mnemonic combination, it's consumed, but we need
+ // set altKeyPressed to false, otherwise after selection
+ // component by mnemonic combination a menu will be open
+ altKeyPressed = false;
+ }
return false;
}
if (ev.getKeyCode() == KeyEvent.VK_ALT) {
--- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -413,7 +413,7 @@
}
public Grid(Color fg, Color bg) {
- int cmap[] = { fg.getRGB(), bg.getRGB() };
+ int[] cmap = { fg.getRGB(), bg.getRGB() };
IndexColorModel icm = new IndexColorModel(8, 2, cmap, 0, false, -1,
DataBuffer.TYPE_BYTE);
image = new BufferedImage(BUFFER_SIZE, BUFFER_SIZE,
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -594,7 +594,7 @@
}
private void setFSWindowsState(Window other, int state) {
- GraphicsDevice gds[] =
+ GraphicsDevice[] gds =
GraphicsEnvironment.getLocalGraphicsEnvironment().
getScreenDevices();
// check if the de/activation was caused by other
--- a/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -141,8 +141,8 @@
@Override
public void displayChanged() {
// getNumScreens() will return the correct current number of screens
- GraphicsDevice newDevices[] = new GraphicsDevice[getNumScreens()];
- GraphicsDevice oldScreens[] = screens;
+ GraphicsDevice[] newDevices = new GraphicsDevice[getNumScreens()];
+ GraphicsDevice[] oldScreens = screens;
// go through the list of current devices and determine if they
// could be reused, or will have to be replaced
if (oldScreens != null) {
--- a/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, 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
@@ -207,7 +207,7 @@
if (bb instanceof BufferedImage) {
BufferedImage bi = (BufferedImage)bb;
- int data[] =
+ int[] data =
((DataBufferInt)bi.getRaster().getDataBuffer()).getData();
peer.updateWindowImpl(data, bi.getWidth(), bi.getHeight());
return true;
@@ -222,7 +222,7 @@
int w = viBB.getWidth();
int h = viBB.getHeight();
BufImgSurfaceData bisd = (BufImgSurfaceData)s;
- int data[] = ((DataBufferInt)bisd.getRaster(0,0,w,h).
+ int[] data = ((DataBufferInt)bisd.getRaster(0,0,w,h).
getDataBuffer()).getData();
peer.updateWindowImpl(data, w, h);
return true;
@@ -233,7 +233,7 @@
// copy the passed image into our own buffer, then upload
BufferedImage bi = (BufferedImage)clearImage(backBuffer);
- int data[] =
+ int[] data =
((DataBufferInt)bi.getRaster().getDataBuffer()).getData();
peer.updateWindowImpl(data, bi.getWidth(), bi.getHeight());
@@ -332,7 +332,7 @@
if (bb instanceof DestSurfaceProvider) {
Surface s = ((DestSurfaceProvider)bb).getDestSurface();
if (s instanceof AccelSurface) {
- final boolean arr[] = { false };
+ final boolean[] arr = { false };
final AccelSurface as = (AccelSurface)s;
final int w = as.getBounds().width;
final int h = as.getBounds().height;
--- a/src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -64,7 +64,7 @@
Raster raster = bimage.getRaster();
DataBuffer buffer = raster.getDataBuffer();
// REMIND: native code should use ScanStride _AND_ width
- int data[] = ((DataBufferInt)buffer).getData();
+ int[] data = ((DataBufferInt)buffer).getData();
byte[] andMask = new byte[w * h / 8];
int npixels = pixels.length;
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -774,7 +774,7 @@
iSelStart = -1;
bufferedStream.mark(BYTE_BUFFER_LEN);
- String astEntries[] = new String[] {
+ String[] astEntries = new String[] {
//common
VERSION,
START_HTML,
--- a/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -89,8 +89,8 @@
* Returns String[] containing available property names
*/
private String [] getKeyNames() {
- Object keys[] = map.keySet().toArray();
- String sortedKeys[] = new String[keys.length];
+ Object[] keys = map.keySet().toArray();
+ String[] sortedKeys = new String[keys.length];
for ( int nkey = 0; nkey < keys.length; nkey++ ) {
sortedKeys[nkey] = keys[nkey].toString();
--- a/src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, 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
@@ -43,7 +43,7 @@
/**
* The widths of the first 256 characters.
*/
- int widths[];
+ int[] widths;
/**
* The standard ascent of the font. This is the logical height
@@ -181,13 +181,13 @@
* Return the width of the specified char[] in this Font.
*/
@Override
- public native int charsWidth(char data[], int off, int len);
+ public native int charsWidth(char[] data, int off, int len);
/**
* Return the width of the specified byte[] in this Font.
*/
@Override
- public native int bytesWidth(byte data[], int off, int len);
+ public native int bytesWidth(byte[] data, int off, int len);
/**
* Get the widths of the first 256 characters in the font.
--- a/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -90,7 +90,7 @@
// Initialize highlight mapping table
static {
@SuppressWarnings({"rawtypes", "unchecked"})
- Map<TextAttribute,Object> styles[] = new Map[4];
+ Map<TextAttribute,Object>[] styles = new Map[4];
HashMap<TextAttribute,Object> map;
// UNSELECTED_RAW_TEXT_HIGHLIGHT
--- a/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -42,14 +42,14 @@
public int[] getSelectedIndexes() {
List l = (List)target;
int len = l.getItemCount();
- int sel[] = new int[len];
+ int[] sel = new int[len];
int nsel = 0;
for (int i = 0 ; i < len ; i++) {
if (isSelected(i)) {
sel[nsel++] = i;
}
}
- int selected[] = new int[nsel];
+ int[] selected = new int[nsel];
System.arraycopy(sel, 0, selected, 0, nsel);
return selected;
}
@@ -147,7 +147,7 @@
setMultipleSelections(li.isMultipleMode());
// select the item if necessary.
- int sel[] = li.getSelectedIndexes();
+ int[] sel = li.getSelectedIndexes();
for (int i = 0 ; i < sel.length ; i++) {
select(sel[i]);
}
--- a/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -1735,7 +1735,7 @@
/** MediaSizeName / dmPaper */
private int[] getWin32MediaAttrib() {
- int wid_ht[] = {0, 0};
+ int[] wid_ht = {0, 0};
if (attributes != null) {
Media media = (Media)attributes.get(Media.class);
if (media instanceof MediaSizeName) {
--- a/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -75,10 +75,10 @@
@Override
public int [] getRGBPixels(Rectangle bounds) {
- int pixelArray[] = new int[bounds.width*bounds.height];
+ int[] pixelArray = new int[bounds.width*bounds.height];
getRGBPixels(bounds.x, bounds.y, bounds.width, bounds.height, pixelArray);
return pixelArray;
}
- private native void getRGBPixels(int x, int y, int width, int height, int pixelArray[]);
+ private native void getRGBPixels(int x, int y, int width, int height, int[] pixelArray);
}
--- a/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -157,7 +157,7 @@
void createNativeImage(BufferedImage bimage) {
Raster raster = bimage.getRaster();
byte[] andMask = new byte[TRAY_ICON_MASK_SIZE];
- int pixels[] = ((DataBufferInt)raster.getDataBuffer()).getData();
+ int[] pixels = ((DataBufferInt)raster.getDataBuffer()).getData();
int npixels = pixels.length;
int ficW = raster.getWidth();
--- a/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java Wed Oct 24 13:35:18 2018 +0530
@@ -540,7 +540,7 @@
Win32GraphicsDevice oldDev = winGraphicsConfig.getDevice();
Win32GraphicsDevice newDev;
- GraphicsDevice devs[] = GraphicsEnvironment
+ GraphicsDevice[] devs = GraphicsEnvironment
.getLocalGraphicsEnvironment()
.getScreenDevices();
// Occasionally during device addition/removal getScreenImOn can return
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, 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
@@ -428,7 +428,7 @@
}
// make a copy to avoid synchronization during the loop
- D3DWindowSurfaceData surfaces[] = new D3DWindowSurfaceData[] {};
+ D3DWindowSurfaceData[] surfaces = new D3DWindowSurfaceData[] {};
synchronized (this) {
surfaces = d3dwSurfaces.toArray(surfaces);
}
--- a/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, 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
@@ -112,7 +112,7 @@
}
long cfginfo = 0;
- final String ids[] = new String[1];
+ final String[] ids = new String[1];
OGLRenderQueue rq = OGLRenderQueue.getInstance();
rq.lock();
try {
--- a/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -141,7 +141,7 @@
int npoints, boolean isclosed);
public void drawPolyline(SunGraphics2D sg2d,
- int xpoints[], int ypoints[],
+ int[] xpoints, int[] ypoints,
int npoints)
{
try {
@@ -154,7 +154,7 @@
}
public void drawPolygon(SunGraphics2D sg2d,
- int xpoints[], int ypoints[],
+ int[] xpoints, int[] ypoints,
int npoints)
{
try {
@@ -243,7 +243,7 @@
int npoints);
public void fillPolygon(SunGraphics2D sg2d,
- int xpoints[], int ypoints[],
+ int[] xpoints, int[] ypoints,
int npoints)
{
try {
@@ -291,7 +291,7 @@
// by a native FillSpans method or a getHintedStrokeGeneralPath()
// method that could be filled by the doShape method more quickly.
public void doFillSpans(SunGraphics2D sg2d, SpanIterator si) {
- int box[] = new int[4];
+ int[] box = new int[4];
GDIWindowSurfaceData sd;
try {
sd = (GDIWindowSurfaceData)sg2d.surfaceData;
--- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -669,7 +669,7 @@
* @see AWTEventMonitor
*/
protected void installListeners() {
- Window topLevelWindows[] = EventQueueMonitor.getTopLevelWindows();
+ Window[] topLevelWindows = EventQueueMonitor.getTopLevelWindows();
if (topLevelWindows != null) {
for (int i = 0; i < topLevelWindows.length; i++) {
installListeners(topLevelWindows[i]);
@@ -685,7 +685,7 @@
* @see EventID
*/
protected void installListeners(int eventID) {
- Window topLevelWindows[] = EventQueueMonitor.getTopLevelWindows();
+ Window[] topLevelWindows = EventQueueMonitor.getTopLevelWindows();
if (topLevelWindows != null) {
for (int i = 0; i < topLevelWindows.length; i++) {
installListeners(topLevelWindows[i], eventID);
@@ -943,7 +943,7 @@
* @see EventID
*/
protected void removeListeners(int eventID) {
- Window topLevelWindows[] = EventQueueMonitor.getTopLevelWindows();
+ Window[] topLevelWindows = EventQueueMonitor.getTopLevelWindows();
if (topLevelWindows != null) {
for (int i = 0; i < topLevelWindows.length; i++) {
removeListeners(topLevelWindows[i], eventID);
--- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -128,7 +128,7 @@
* @see AWTEventMonitor
*/
protected void installListeners() {
- Window topLevelWindows[] = EventQueueMonitor.getTopLevelWindows();
+ Window[] topLevelWindows = EventQueueMonitor.getTopLevelWindows();
if (topLevelWindows != null) {
for (int i = 0; i < topLevelWindows.length; i++) {
if (topLevelWindows[i] instanceof Accessible) {
@@ -206,7 +206,7 @@
* @see EventID
*/
protected void removeListeners() {
- Window topLevelWindows[] = EventQueueMonitor.getTopLevelWindows();
+ Window[] topLevelWindows = EventQueueMonitor.getTopLevelWindows();
if (topLevelWindows != null) {
for (int i = 0; i < topLevelWindows.length; i++) {
if (topLevelWindows[i] instanceof Accessible) {
--- a/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/Translator.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, 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
@@ -318,7 +318,7 @@
if (source instanceof Component) {
Container parent = ((Component) source).getParent();
if (parent != null) {
- Component ca[] = parent.getComponents();
+ Component[] ca = parent.getComponents();
for (int i = 0; i < ca.length; i++) {
if (source.equals(ca[i])) {
return i;
--- a/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java Tue Oct 23 17:01:48 2018 -0400
+++ b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -291,9 +291,9 @@
* map an HWND to an AWT Component
*/
private void initHWNDcalls() {
- Class<?> integerParemter[] = new Class<?>[1];
+ Class<?>[] integerParemter = new Class<?>[1];
integerParemter[0] = Integer.TYPE;
- Class<?> componentParemter[] = new Class<?>[1];
+ Class<?>[] componentParemter = new Class<?>[1];
try {
componentParemter[0] = Class.forName("java.awt.Component");
} catch (ClassNotFoundException e) {
--- a/test/jdk/ProblemList.txt Tue Oct 23 17:01:48 2018 -0400
+++ b/test/jdk/ProblemList.txt Wed Oct 24 13:35:18 2018 +0530
@@ -758,7 +758,6 @@
javax/swing/text/DefaultCaret/HidingSelection/HidingSelectionTest.java 8194048 windows-all
javax/swing/text/JTextComponent/5074573/bug5074573.java 8196100 windows-all
javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
-javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java 8196434 linux-all,solaris-all
javax/swing/JComboBox/8032878/bug8032878.java 8196439 linux-all
javax/swing/JComboBox/8182031/ComboPopupTest.java 8196465 linux-all,macosx-all
javax/swing/JFileChooser/6738668/bug6738668.java 8194946 generic-all
@@ -808,7 +807,6 @@
javax/swing/text/html/parser/Parser/8078268/bug8078268.java 8199092 generic-all
javax/swing/PopupFactory/8048506/bug8048506.java 8202660 windows-all
javax/swing/JTextArea/TextViewOOM/TextViewOOM.java 8167355 generic-all
-javax/swing/JEditorPane/8195095/ImageViewTest.java 8202656 windows-all
javax/swing/text/Utilities/8142966/SwingFontMetricsTest.java 8199529 windows-all
javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java 202880 linux-all
javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765 macosx-all,linux-all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/com/sun/java/swing/plaf/windows/AltFocusIssueTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2018, 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 8211987
+ @requires (os.family == "windows")
+ @summary Verify if Menu bar gets input focus even if Alt-released event is consumed.
+ @modules java.desktop/com.sun.java.swing.plaf.windows
+ @run main AltFocusIssueTest
+*/
+
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+/**
+ * Try to demonstrate the wrong behavior
+ */
+public class AltFocusIssueTest {
+
+ /**
+ * Menu inside menu bar of the frame
+ */
+ private static JMenu menu;
+
+ /**
+ * Text area to test on.
+ */
+ private static JTextArea ta;
+
+ private static JFrame frame;
+
+ /**
+ * Test that the text area loses input focus although Alt-released event is consumed.
+ *
+ * @throws InterruptedException
+ * @throws InvocationTargetException
+ */
+ public static void testAltEvents() throws Exception {
+ Robot robot = new Robot();
+ SwingUtilities.invokeAndWait(() -> {
+ try {
+ createUI();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ robot.waitForIdle();
+ SwingUtilities.invokeAndWait(() -> ta.requestFocusInWindow());
+ robot.waitForIdle();
+ if (!ta.isFocusOwner()) {
+ throw new RuntimeException("textarea should have input focus");
+ }
+ if (menu.isSelected()) {
+ throw new RuntimeException("menu is selected...");
+ }
+
+ // Simulate an Alt-typed event
+ robot.keyPress(KeyEvent.VK_ALT);
+ robot.keyRelease(KeyEvent.VK_ALT);
+ robot.waitForIdle();
+
+ // Since the event is consumed, I expect the input focus to be in the text area
+ if (!ta.isFocusOwner()) {
+ throw new RuntimeException("textarea should still have input focus");
+ }
+ // OR
+ if (SwingUtilities.getRootPane(ta).isFocusOwner()) {
+ throw new RuntimeException("Focus should not be changed from the text area");
+ }
+ // OR
+ if (menu.isSelected()) {
+ throw new RuntimeException("Menu must not be selected");
+ }
+ }
+
+ /**
+ * Builds UI to test.
+ *
+ */
+ private static void createUI() throws Exception {
+ // Install Windows L&F
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+
+ frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ JMenuBar menuBar = new JMenuBar();
+ frame.setJMenuBar(menuBar);
+
+ menu = new JMenu("Menu");
+ menu.add(new JMenuItem("Menu item"));
+ menuBar.add(menu);
+
+ ta = new JTextArea();
+ frame.getContentPane().add(ta);
+
+ ta.addKeyListener( new KeyAdapter() {
+ @Override
+ public void keyReleased(KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_ALT) {
+ /*
+ * This is where I need to do special handling of the Alt-released event.
+ * After, nobody else must react to this event, thus I consume it.
+ */
+ e.consume();
+ }
+ }
+ });
+
+ frame.setSize(400, 300);
+ frame.setVisible(true);
+ }
+
+ public static void main(String[] args) throws Exception {
+ try {
+ testAltEvents();
+ } finally {
+ SwingUtilities.invokeAndWait(() -> frame.dispose());
+ }
+ }
+}
--- a/test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java Tue Oct 23 17:01:48 2018 -0400
+++ b/test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -108,7 +108,7 @@
robot.delay(1000);
- robot.mouseMove(loc.x + size.width / 2, loc.y + size.height + size.height / 2);
+ robot.mouseMove(loc.x + size.width / 2, loc.y + size.height);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.waitForIdle();
--- a/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java Tue Oct 23 17:01:48 2018 -0400
+++ b/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -43,7 +43,7 @@
/**
* @test
* @key headful
- * @bug 8043869 8075244 8078082 8145173 8151787
+ * @bug 8043869 8075244 8078082 8145173 8151787 8212213
* @summary Tests the HiDPI splash screen support for windows and MAC
* @modules java.desktop/sun.java2d
* @run main MultiResolutionSplashTest GENERATE_IMAGES
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/print/PrinterJob/TestSaveFileWithoutPrinter.java Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2018, 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 8211055
+ @summary Verifies "print to file" works even when there is no printer
+ @requires (os.family == "mac")
+ @run main/manual TestSaveFileWithoutPrinter
+ */
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.print.Printable;
+import java.awt.print.PageFormat;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+import javax.swing.WindowConstants;
+
+public class TestSaveFileWithoutPrinter implements Printable {
+ private static final CountDownLatch testEndedSignal = new CountDownLatch(1);
+ private static final int testTimeout = 300000;
+ private static volatile String testFailureMsg;
+ private static volatile boolean testPassed;
+ private static volatile boolean testFinished;
+ private static PrinterJob job;
+
+ public static void main(String[] args) {
+ job = PrinterJob.getPrinterJob();
+ if (job.getPrintService() != null) {
+ System.out.println("This test requires no printers to be installed. Exiting.");
+ return;
+ }
+ SwingUtilities.invokeLater(() -> createAndShowTestDialog());
+
+ try {
+ if (!testEndedSignal.await(testTimeout, TimeUnit.MILLISECONDS)) {
+ throw new RuntimeException(String.format(
+ "Test timeout '%d ms' elapsed.", testTimeout));
+ }
+ if (!testPassed) {
+ String failureMsg = testFailureMsg;
+ if ((failureMsg != null) && (!failureMsg.trim().isEmpty())) {
+ throw new RuntimeException(failureMsg);
+ } else {
+ throw new RuntimeException("Test failed.");
+ }
+ }
+ } catch (InterruptedException ie) {
+ throw new RuntimeException(ie);
+ } finally {
+ testFinished = true;
+ }
+ }
+
+ private static void doTest() {
+ job.setPrintable(new TestSaveFileWithoutPrinter());
+ if (job.printDialog()) {
+ try {
+ job.print();
+ } catch (PrinterException pe) {
+ throw new RuntimeException(pe);
+ }
+ }
+ }
+
+ private static void pass() {
+ testPassed = true;
+ testEndedSignal.countDown();
+ }
+
+ private static void fail(String failureMsg) {
+ testFailureMsg = failureMsg;
+ testPassed = false;
+ testEndedSignal.countDown();
+ }
+
+ private static String convertMillisToTimeStr(int millis) {
+ if (millis < 0) {
+ return "00:00:00";
+ }
+ int hours = millis / 3600000;
+ int minutes = (millis - hours * 3600000) / 60000;
+ int seconds = (millis - hours * 3600000 - minutes * 60000) / 1000;
+ return String.format("%02d:%02d:%02d", hours, minutes, seconds);
+ }
+
+ private static void createAndShowTestDialog() {
+ String description =
+ " To run this test it is required to delete any installed printers.\r\n" +
+ "\r\n" +
+ " 1. Verify that saving file via \"Save as PDF\" results in saving file\r\n" +
+ " even if there is no installed printer.\r\n" +
+ " 2. Click on \"Start Test\" button.\r\n" +
+ " 3. In the shown print dialog select \"Save as PDF\" in PDF drop-down list\r\n" +
+ " 4. Another dialog opens prompting for filename, enter any filename and press \"Save\".\r\n" +
+ "\r\n" +
+ " If the file is saved without any PrinterException, click on \"PASS\"\r\n" +
+ " button, otherwise click on \"FAIL\" button.";
+
+ final JDialog dialog = new JDialog();
+ dialog.setTitle("SaveFileWithoutPrinter");
+ dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ dialog.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ dialog.dispose();
+ fail("Main dialog was closed.");
+ }
+ });
+
+ final JLabel testTimeoutLabel = new JLabel(String.format(
+ "Test timeout: %s", convertMillisToTimeStr(testTimeout)));
+ final long startTime = System.currentTimeMillis();
+ final Timer timer = new Timer(0, null);
+ timer.setDelay(1000);
+ timer.addActionListener((e) -> {
+ int leftTime = testTimeout - (int) (System.currentTimeMillis() - startTime);
+ if ((leftTime < 0) || testFinished) {
+ timer.stop();
+ dialog.dispose();
+ }
+ testTimeoutLabel.setText(String.format(
+ "Test timeout: %s", convertMillisToTimeStr(leftTime)));
+ });
+ timer.start();
+
+ JTextArea textArea = new JTextArea(description);
+ textArea.setEditable(false);
+
+ final JButton testButton = new JButton("Start Test");
+ final JButton passButton = new JButton("PASS");
+ final JButton failButton = new JButton("FAIL");
+ testButton.addActionListener((e) -> {
+ testButton.setEnabled(false);
+ new Thread(() -> {
+ try {
+ doTest();
+
+ SwingUtilities.invokeLater(() -> {
+ passButton.setEnabled(true);
+ failButton.setEnabled(true);
+ });
+ } catch (Throwable t) {
+ t.printStackTrace();
+ dialog.dispose();
+ fail("Exception occurred in a thread executing the test.");
+ }
+ }).start();
+ });
+ passButton.setEnabled(false);
+ passButton.addActionListener((e) -> {
+ dialog.dispose();
+ pass();
+ });
+ failButton.setEnabled(false);
+ failButton.addActionListener((e) -> {
+ dialog.dispose();
+ fail("PrinterException thrown.");
+ });
+
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ JPanel labelPanel = new JPanel(new FlowLayout());
+ labelPanel.add(testTimeoutLabel);
+ mainPanel.add(labelPanel, BorderLayout.NORTH);
+ mainPanel.add(textArea, BorderLayout.CENTER);
+ JPanel buttonPanel = new JPanel(new FlowLayout());
+ buttonPanel.add(testButton);
+ buttonPanel.add(passButton);
+ buttonPanel.add(failButton);
+ mainPanel.add(buttonPanel, BorderLayout.SOUTH);
+ dialog.add(mainPanel);
+
+ dialog.pack();
+ dialog.setVisible(true);
+ }
+
+ @Override
+ public int print(Graphics g, PageFormat pf, int pageIndex)
+ throws PrinterException {
+ if (pageIndex == 0) {
+ return Printable.PAGE_EXISTS;
+ } else {
+ return Printable.NO_SUCH_PAGE;
+ }
+ }
+}
--- a/test/jdk/javax/swing/JEditorPane/8195095/ImageViewTest.java Tue Oct 23 17:01:48 2018 -0400
+++ b/test/jdk/javax/swing/JEditorPane/8195095/ImageViewTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -24,7 +24,7 @@
/**
* @test
* @key headful
- * @bug 8195095 8206238
+ * @bug 8195095 8206238 8208638
* @summary Tests if Images are scaled correctly in JEditorPane.
* @run main ImageViewTest
*/
@@ -51,8 +51,11 @@
f.add(editorPane);
f.setSize(WIDTH + 20, HEIGHT + 40);
f.setLocationRelativeTo(null);
-
f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+ //This line will trigger the imageupdate, and consequently, the view
+ //will be populated with the appropriate color when the pixel color
+ //is queried by robot.
+ editorPane.getUI().getPreferredSize(editorPane);
f.setVisible(true);
});
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesSecurityManagerTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2018 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 8182041
+ * @summary Tests if the files(Shortcut Panle files, FileChooser ComboBox files)
+ * are filtered out when run with SecurityManager enabled.
+ * @run main/othervm/policy=shellfolderqueries.policy ShellFolderQueriesSecurityManagerTest
+ */
+
+import javax.swing.filechooser.FileSystemView;
+import java.io.File;
+import java.util.Arrays;
+
+public class ShellFolderQueriesSecurityManagerTest {
+ static final FileSystemView fsv = FileSystemView.getFileSystemView();
+
+ public static void main(String[] args) throws Exception {
+ try {
+ File[] shortcuts = fsv.getChooserShortcutPanelFiles();
+ Arrays.asList(shortcuts).forEach(System.out::println);
+
+ if (shortcuts.length != 0) {
+ throw new RuntimeException("Shortcut panel files leaked from SecurityManager.");
+ }
+
+ File[] cbFiles = fsv.getChooserComboBoxFiles();
+ Arrays.asList(cbFiles).forEach(System.out::println);
+ if (cbFiles.length != 0) {
+ throw new RuntimeException("Combobox Files leaked from SecurityManager.");
+ }
+
+ System.out.println("ok");
+ } catch (SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
--- a/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesTest.java Tue Oct 23 17:01:48 2018 -0400
+++ b/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/ShellFolderQueriesTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018 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,7 +23,7 @@
/*
* @test
- * @bug 8081722
+ * @bug 8081722 8182041
* @summary Provide public API for file hierarchy provided by
* sun.awt.shell.ShellFolder
* @author Semyon Sadetsky
@@ -53,6 +53,7 @@
System.out.println("Windows detected: will run shortcut test");
testGet();
testLink();
+ testShortcutPanelFiles();
} else {
testGet();
}
@@ -119,4 +120,11 @@
}
}
}
+
+ private static void testShortcutPanelFiles() {
+ File[] shortcuts = fsv.getChooserShortcutPanelFiles();
+ if (shortcuts.length == 0) {
+ throw new RuntimeException("No shortcut panel files found.");
+ }
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JFileChooser/ShellFolderQueries/shellfolderqueries.policy Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,5 @@
+grant {
+ permission java.util.PropertyPermission "user.home", "read";
+ permission java.util.PropertyPermission "os.name", "read";
+ permission java.util.PropertyPermission "os.version", "read";
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/JSpinner/WrongEditorTextFieldFont/FontSetToNull.java Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2018, 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.Font;
+
+import javax.swing.JSpinner;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.plaf.UIResource;
+
+import static javax.swing.JSpinner.DefaultEditor;
+import static javax.swing.UIManager.getInstalledLookAndFeels;
+
+/**
+ * @test
+ * @key headful
+ * @bug 8210739
+ */
+public final class FontSetToNull {
+
+ private static final Font USERS_FONT = new Font("dialog", Font.BOLD, 41);
+
+ public static void main(final String[] args) throws Exception {
+ for (final UIManager.LookAndFeelInfo laf : getInstalledLookAndFeels()) {
+ SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
+ SwingUtilities.invokeAndWait(() -> {
+ // default spinner
+ test(new JSpinner());
+ // spinner which always uses the null font
+ test(new JSpinner(){
+ @Override
+ public Font getFont() {
+ return null;
+ }
+ });
+ });
+ }
+ }
+
+ /**
+ * A sequence of methods that test a possible NPE.
+ */
+ private static void test(JSpinner spinner) {
+ final DefaultEditor de = (DefaultEditor) spinner.getEditor();
+
+ spinner.setFont(null); // Check possible NPE
+ SwingUtilities.updateComponentTreeUI(de); // Check possible NPE
+ spinner.setFont(null); // Check possible NPE
+
+ // should not replace the font of the TextField
+ de.getTextField().setFont(USERS_FONT);
+ spinner.setFont(null);
+
+ final Font tff = de.getTextField().getFont();
+ if (tff instanceof UIResource || !tff.equals(USERS_FONT)) {
+ throw new RuntimeException("Wrong font: " + tff);
+ }
+
+ spinner.setEditor(new JSpinner().getEditor()); // Check possible NPE
+ }
+
+ private static void setLookAndFeel(final UIManager.LookAndFeelInfo laf) {
+ try {
+ UIManager.setLookAndFeel(laf.getClassName());
+ System.out.println("LookAndFeel: " + laf.getClassName());
+ } catch (ClassNotFoundException | InstantiationException |
+ UnsupportedLookAndFeelException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/swing/UIDefaults/TestUIDefaultsErrorHandling.java Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2018, 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 6828982
+ @summary Verifies UIDefaults.getUI retains original exception
+ @run main TestUIDefaultsErrorHandling
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicLabelUI;
+
+public class TestUIDefaultsErrorHandling {
+
+ private final static String erroutput = "oops, complex problem with diagnostics";
+
+ public static void main(String[] args) {
+ final PrintStream err = System.err;
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ System.setErr(new PrintStream(bytes));
+
+ try {
+ UIDefaults defaults = UIManager.getDefaults();
+ defaults.put("BrokenUI", BrokenUI.class.getName());
+ defaults.getUI(new JLabel() {
+ public @Override String getUIClassID() {
+ return "BrokenUI";
+ }
+ });
+ if (!(bytes.toString().contains(erroutput))) {
+ throw new RuntimeException("UIDefauls swallows exception trace");
+ }
+ } finally {
+ System.setErr(err);
+ }
+ }
+ public static class BrokenUI extends BasicLabelUI {
+ public static ComponentUI createUI(JComponent target) {
+ return new BrokenUI();
+ }
+ private BrokenUI() {
+ throw new RuntimeException(erroutput);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/client/SwingSet/src/FileChooserDemoTest.java Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2018, 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 org.jtregext.GuiTestListener;
+import com.sun.swingset3.demos.filechooser.FileChooserDemo;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.APPLY_FILTER_TOOLTIP;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.DEMO_TITLE;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.FILE_CHOOSER_DEMO_CANCEL_TEXT;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.FILE_CHOOSER_DEMO_SAVEQUESTION_TITLE;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.FILE_CHOOSER_DEMO_SAVE_TEXT;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.FILE_CHOOSER_DEMO_SELECT_TEXT;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.FILE_CHOOSER_DEMO_SELECT_WITH_PREVIEW;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.FLIP_HORIZONTAL_TOOLTIP;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.FLIP_VERTICAL_TOOLTIP;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.GRAY;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.ROTATE_LEFT_TOOLTIP;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.ROTATE_RIGHT_TOOLTIP;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.getFlipHorizontalCount;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.getFlipVerticalCount;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.getLastAppliedFilterId;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.getRotateLeftCount;
+import static com.sun.swingset3.demos.filechooser.FileChooserDemo.getRotateRightCount;
+import java.awt.Container;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.testng.annotations.Test;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JComboBoxOperator;
+import org.netbeans.jemmy.operators.JToggleButtonOperator;
+import org.netbeans.jemmy.operators.JFileChooserOperator;
+import org.netbeans.jemmy.operators.JDialogOperator;
+import org.netbeans.jemmy.util.Platform;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Listeners;
+import org.jemmy2ext.JemmyExt.ByToolTipChooser;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 FileChooserDemo by selecting an image file
+ * using Select Image and Select with preview, performing image
+ * transformation operations on the selected image and saving it.
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Extensions/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @modules java.desktop
+ * java.logging
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.filechooser.FileChooserDemo
+ * @run testng FileChooserDemoTest
+ */
+@Listeners(GuiTestListener.class)
+public class FileChooserDemoTest {
+
+ public static final Path TEST_SRC = Paths.get(System.getProperty("test.src"));
+ public static final Path TEST_WORK_DIR = Paths.get(System.getProperty("user.dir"));
+ public static final Path IMAGE_DIR = TEST_SRC.resolve("resources").resolve("images");
+ public static final String IMAGE = "duke.jpg";
+ private static final String YES = "Yes";
+ private static final String NO = "No";
+ private static final String SCRATCH = "scratch";
+ private static final String OPEN = "Open";
+ private static final String CANCEL = "Cancel";
+ private static final String USER_HOME = "user.home";
+ private static final String DESKTOP = "Desktop";
+ private static final int greyFilterID = 7;
+
+ private JFrameOperator frame;
+ private JButtonOperator selectImageButton;
+ private JButtonOperator selectWithPreviewButton;
+ private JFileChooserOperator fileChooser;
+ private JButtonOperator upLevelButton;
+ private JButtonOperator rotateLeftButton;
+ private JButtonOperator rotateRightButton;
+ private JButtonOperator flipHorizontalButton;
+ private JButtonOperator flipVerticalButton;
+ private JButtonOperator applyFilterButton;
+ private JButtonOperator saveButton;
+ private JButtonOperator cancelButton;
+ private JButtonOperator yesButton;
+ private JButtonOperator noButton;
+ private JButtonOperator openButton;
+ private JComboBoxOperator filterComboBox;
+ private JDialogOperator confirmationDialog;
+ private JToggleButtonOperator getDetailsToggleButton;
+ private JToggleButtonOperator getListToggleButton;
+ private JDialogOperator fileChooserDialog;
+
+ @BeforeTest
+ public void beforeTest() throws Exception {
+ Files.copy(IMAGE_DIR.resolve(IMAGE), TEST_WORK_DIR.resolve(IMAGE));
+ }
+
+ @Test
+ public void test() throws Exception {
+ new ClassReference(FileChooserDemo.class.getCanonicalName()).startApplication();
+ frame = new JFrameOperator(DEMO_TITLE);
+ initializeSelectImageButtons();
+ initializeImageOperationButtons();
+ checkSelectImage();
+ checkImageOperations();
+ checkSelectWithPreview();
+ checkImageOperations();
+ }
+
+ private void checkSelectImage() throws Exception {
+ selectImageButton.push();
+ fileChooser = new JFileChooserOperator(JFileChooserOperator.findJFileChooser((Container) frame.getSource()));
+ // In Mac, JFileChooser does not have "Go Home","Up One Level","Get Details","Get List" buttons.
+ if (!Platform.isOSX()) {
+ initializeFileChooserButtons();
+ File previousDirectory = fileChooser.getCurrentDirectory();
+ fileChooser.goHome();
+ // In Windows, pressing goHome navigates to Desktop inside the home directory.
+ // This seems to be the expected behavior for windows.
+ if (!Platform.isWindows()) {
+ waitCurrentPath(Paths.get(System.getProperty(USER_HOME)));
+ } else {
+ waitCurrentPath(Paths.get(System.getProperty(USER_HOME)).resolve(DESKTOP));
+ }
+ fileChooser.setCurrentDirectory(previousDirectory);
+ fileChooser.rescanCurrentDirectory();
+ upLevelButton.push();
+ waitCurrentPath(previousDirectory.getParentFile().toPath());
+ fileChooser.enterSubDir(SCRATCH);
+ getListToggleButton.push();
+ getListToggleButton.waitSelected(true);
+ getDetailsToggleButton.push();
+ getDetailsToggleButton.waitSelected(true);
+ getListToggleButton.push();
+ fileChooser.rescanCurrentDirectory();
+ // Wait for the count of number of files to be 1
+ fileChooser.waitFileCount(1);
+ fileChooser.selectFile(IMAGE);
+ } else {
+ fileChooser.setCurrentDirectory(TEST_WORK_DIR.toFile());
+ fileChooser.selectFile(IMAGE);
+ }
+ selectImageButton.push();
+ applyFilterButton.waitComponentEnabled();
+ }
+
+ private void checkSelectWithPreview() {
+ selectWithPreviewButton.pushNoBlock();
+ initializeSelectWithPreviewDialog();
+ cancelButton.push();
+ fileChooserDialog.waitClosed();
+ selectWithPreviewButton.pushNoBlock();
+ initializeSelectWithPreviewDialog();
+ fileChooser.selectFile(IMAGE);
+ openButton.push();
+ fileChooserDialog.waitClosed();
+ }
+
+ private void checkImageOperations() throws Exception {
+ // Check Rotate Left Button
+ {
+ int initialValue = getRotateLeftCount();
+ // Push Button and wait for rotateLeftCount count to increment.
+ rotateLeftButton.push();
+ rotateLeftButton.waitState(button -> getRotateLeftCount() == initialValue + 1);
+ }
+ // Check Rotate Right Button
+ {
+ int initialValue = getRotateRightCount();
+ // Push Button and wait for rotateRightCount count to increment.
+ rotateRightButton.push();
+ rotateRightButton.waitState(button -> getRotateRightCount() == initialValue + 1);
+ }
+ // Check Apply Filter Button
+ filterComboBox.selectItem(GRAY);
+ applyFilterButton.push();
+ applyFilterButton.waitState(button -> getLastAppliedFilterId() == greyFilterID);
+ // Check Save and Yes Buttons
+ initializeSaveAndCancelButton();
+ saveButton.pushNoBlock();
+ //Wait for the dialog to show and initialize it
+ waitAndinitializeConfirmationDialog();
+ yesButton.push();
+ waitButtonDisabled(saveButton);
+
+ // Check Flip Vertical Button
+ {
+ int initialValue = getFlipVerticalCount();
+ // Push Button and wait for flipVerticalCount count to increment.
+ flipVerticalButton.push();
+ flipVerticalButton.waitState(button -> getFlipVerticalCount() == initialValue + 1);
+
+ }
+ // Check Save and No Buttons
+ saveButton.pushNoBlock();
+ //Wait for the dialog to show and initialize it
+ waitAndinitializeConfirmationDialog();
+ noButton.push();
+ confirmationDialog.waitClosed();
+ saveButton.waitComponentEnabled();
+ // Check Flip Horizontal Button
+ {
+ int initialValue = getFlipHorizontalCount();
+ // Push Button and wait for flipHorizontalCount count to increment.
+ flipHorizontalButton.push();
+ flipHorizontalButton.waitState(button -> getFlipHorizontalCount() == initialValue + 1);
+ }
+ // Check Cancel Button
+ cancelButton.push();
+ waitButtonDisabled(saveButton);
+ }
+
+ private void initializeFileChooserButtons() {
+ upLevelButton = new JButtonOperator(fileChooser.getUpLevelButton());
+ getDetailsToggleButton = new JToggleButtonOperator(fileChooser.getDetailsToggleButton());
+ getListToggleButton = new JToggleButtonOperator(fileChooser.getListToggleButton());
+ }
+
+ private void initializeSelectImageButtons() {
+ selectImageButton = new JButtonOperator(frame, FILE_CHOOSER_DEMO_SELECT_TEXT);
+ selectWithPreviewButton = new JButtonOperator(frame, FILE_CHOOSER_DEMO_SELECT_WITH_PREVIEW);
+ }
+
+ private void initializeSelectWithPreviewDialog() {
+ fileChooser = new JFileChooserOperator();
+ fileChooserDialog = new JDialogOperator(OPEN);
+ openButton = new JButtonOperator(fileChooser, OPEN);
+ cancelButton = new JButtonOperator(fileChooser, CANCEL);
+ }
+
+ private void initializeImageOperationButtons() {
+ rotateLeftButton = new JButtonOperator(frame,
+ new ByToolTipChooser(ROTATE_LEFT_TOOLTIP));
+ rotateRightButton = new JButtonOperator(frame,
+ new ByToolTipChooser(ROTATE_RIGHT_TOOLTIP));
+ flipHorizontalButton = new JButtonOperator(frame,
+ new ByToolTipChooser(FLIP_HORIZONTAL_TOOLTIP));
+ flipVerticalButton = new JButtonOperator(frame,
+ new ByToolTipChooser(FLIP_VERTICAL_TOOLTIP));
+ applyFilterButton = new JButtonOperator(frame,
+ new ByToolTipChooser(APPLY_FILTER_TOOLTIP));
+ filterComboBox = new JComboBoxOperator(frame);
+ }
+
+ private void initializeSaveAndCancelButton() {
+ saveButton = new JButtonOperator(frame, FILE_CHOOSER_DEMO_SAVE_TEXT);
+ cancelButton = new JButtonOperator(frame, FILE_CHOOSER_DEMO_CANCEL_TEXT);
+ }
+
+ private void waitAndinitializeConfirmationDialog() {
+ //Wait for the dialog to show
+ JDialogOperator.waitJDialog(FILE_CHOOSER_DEMO_SAVEQUESTION_TITLE, true, true);
+ confirmationDialog = new JDialogOperator(FILE_CHOOSER_DEMO_SAVEQUESTION_TITLE);
+ yesButton = new JButtonOperator(confirmationDialog, YES);
+ noButton = new JButtonOperator(confirmationDialog, NO);
+ }
+
+ private void waitButtonDisabled(JButtonOperator button) {
+ button.waitState(b -> b.isEnabled() == false);
+ }
+
+ private void waitCurrentPath(Path expectedPath) {
+ Path currentPath = fileChooser.getCurrentDirectory().toPath();
+ //Wait for the current path to be same as expected path
+ fileChooser.waitState(chooser -> currentPath.equals(expectedPath));
+ }
+
+}
Binary file test/jdk/sanity/client/SwingSet/src/resources/images/duke.jpg has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/FileChooserDemo.java Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,637 @@
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Sun Microsystems nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.swingset3.demos.filechooser;
+
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.AffineTransform;
+import java.awt.image.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.*;
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+
+import com.sun.swingset3.demos.JGridPanel;
+import com.sun.swingset3.demos.ResourceManager;
+import com.sun.swingset3.DemoProperties;
+
+/**
+ * JFileChooserDemo
+ *
+ * @author Pavel Porvatov
+ */
+@DemoProperties(
+ value = "JFileChooser Demo",
+ category = "Choosers",
+ description = "Demonstrates JFileChooser, a component which allows the user to open and save files.",
+ sourceFiles = {
+ "com/sun/swingset3/demos/filechooser/FileChooserDemo.java",
+ "com/sun/swingset3/demos/DemoUtilities.java",
+ "com/sun/swingset3/demos/filechooser/resources/FileChooserDemo.properties",
+ "com/sun/swingset3/demos/filechooser/resources/images/apply.png",
+ "com/sun/swingset3/demos/filechooser/resources/images/FileChooserDemo.gif",
+ "com/sun/swingset3/demos/filechooser/resources/images/fliphor.png",
+ "com/sun/swingset3/demos/filechooser/resources/images/flipvert.png",
+ "com/sun/swingset3/demos/filechooser/resources/images/rotateleft.png",
+ "com/sun/swingset3/demos/filechooser/resources/images/rotateright.png"
+ }
+)
+public class FileChooserDemo extends JPanel {
+
+ public static final String DEMO_TITLE = FileChooserDemo.class.getAnnotation(DemoProperties.class).value();
+ public static final String FILE_CHOOSER_DEMO_IMAGE_TEXT = "FileChooserDemo.image.text";
+ public static final String FILE_CHOOSER_DEMO_SAVEQUESTION_MESSAGE = "FileChooserDemo.savequiestion.message";
+ public static final String FILE_CHOOSER_DEMO_ERRORSAVEFILE_MESSAGE = "FileChooserDemo.errorsavefile.message";
+ public static final String FILE_CHOOSER_DEMO_ERRORSAVEFILE_TITLE = "FileChooserDemo.errorsavefile.title";
+ public static final String JPEG_IMAGES = "JPEG images";
+ public static final String ALL_SUPPORTED_IMAGES = "All supported images";
+ public static final String JPG = "jpg";
+ public static final String FILE_CHOOSER_DEMO_SELECTFILE_MESSAGE = "FileChooserDemo.selectfile.message";
+ public static final String FILE_CHOOSER_DEMO_SELECTFILE_TITLE = "FileChooserDemo.selectfile.title";
+ public static final String FILE_CHOOSER_DEMO_ERRORLOADFILE_MESSAGE = "FileChooserDemo.errorloadfile.message";
+ public static final String FILE_CHOOSER_DEMO_ERRORLOADFILE_TITLE = "FileChooserDemo.errorloadfile.title";
+ public static final String FILE_CHOOSER_DEMO_PREVIEW_EMPTY_TEXT = "FileChooserDemo.preview.emptytext";
+ public static final String FILE_CHOOSER_DEMO_PREVIEW_TYPE = "FileChooserDemo.preview.type";
+ public static final String FILE_CHOOSER_DEMO_PREVIEW_SIZE = "FileChooserDemo.preview.size";
+ public static final String FILE_CHOOSER_DEMO_FILTER_GRAY = "FileChooserDemo.filter.gray";
+ public static final String FILE_CHOOSER_DEMO_FILTER_BLUR = "FileChooserDemo.filter.blur";
+ public static final String FILE_CHOOSER_DEMO_FILTER_EDGE = "FileChooserDemo.filter.edge";
+ public static final String FILE_CHOOSER_DEMO_FILTER_SHARPEN = "FileChooserDemo.filter.sharpen";
+ public static final String FILE_CHOOSER_DEMO_FILTER_DARKEN = "FileChooserDemo.filter.darken";
+ public static final String FILE_CHOOSER_DEMO_FILTER_BRIGHTEN = "FileChooserDemo.filter.brighten";
+ public static final String FILE_CHOOSER_DEMO_FILTER_LESSCONTRAST = "FileChooserDemo.filter.lesscontrast";
+ public static final String FILE_CHOOSER_DEMO_FILTER_MORECONTRAST = "FileChooserDemo.filter.morecontrast";
+ public static final String FILE_CHOOSER_DEMO_ROTATE_LEFT_TOOLTIP = "FileChooserDemo.rotateleft.tooltip";
+ public static final String FILE_CHOOSER_DEMO_ROTATE_RIGHT_TOOLTIP = "FileChooserDemo.rotateright.tooltip";
+ public static final String FILE_CHOOSER_DEMO_FLIP_HORIZONTAL_TOOLTIP = "FileChooserDemo.fliphorizontal.tooltip";
+ public static final String FILE_CHOOSER_DEMO_FLIP_VERTICAL_TOOLTIP = "FileChooserDemo.flipvertical.tooltip";
+ public static final String FILE_CHOOSER_DEMO_APPLY_FILTER_TOOLTIP = "FileChooserDemo.applyfilter.tooltip";
+
+ private static final ResourceManager resourceManager = new ResourceManager(FileChooserDemo.class);
+
+ public static final String ROTATE_LEFT_TOOLTIP = resourceManager.getString(FILE_CHOOSER_DEMO_ROTATE_LEFT_TOOLTIP);
+ public static final String ROTATE_RIGHT_TOOLTIP = resourceManager.getString(FILE_CHOOSER_DEMO_ROTATE_RIGHT_TOOLTIP);
+ public static final String FLIP_HORIZONTAL_TOOLTIP = resourceManager.getString(FILE_CHOOSER_DEMO_FLIP_HORIZONTAL_TOOLTIP);
+ public static final String FLIP_VERTICAL_TOOLTIP = resourceManager.getString(FILE_CHOOSER_DEMO_FLIP_VERTICAL_TOOLTIP);
+ public static final String APPLY_FILTER_TOOLTIP = resourceManager.getString(FILE_CHOOSER_DEMO_APPLY_FILTER_TOOLTIP);
+ public static final String FILE_CHOOSER_DEMO_SAVE_TEXT = resourceManager.getString("FileChooserDemo.save.text");
+ public static final String FILE_CHOOSER_DEMO_CANCEL_TEXT = resourceManager.getString("FileChooserDemo.cancel.text");
+ public static final String FILE_CHOOSER_DEMO_SAVEQUESTION_TITLE = resourceManager.getString("FileChooserDemo.savequestion.title");
+ public static final String FILE_CHOOSER_DEMO_SELECT_TEXT = resourceManager.getString("FileChooserDemo.select.text");
+ public static final String FILE_CHOOSER_DEMO_SELECT_WITH_PREVIEW = resourceManager.getString("FileChooserDemo.selectwithpreview.text");
+ public static final String GRAY = resourceManager.getString(FILE_CHOOSER_DEMO_FILTER_GRAY);
+
+ private enum State {
+
+ EMPTY,
+ IMAGE_LOADED,
+ IMAGE_CHANGED
+ }
+
+ private static int rotateLeftCount = 0;
+ private static int rotateRightCount = 0;
+ private static int flipHorizontalCount = 0;
+ private static int flipVerticalCount = 0;
+ private static int lastAppliedFilterId = -1;
+
+ private static final int MIN_FILTER_ID = 0;
+
+ private static final int MAX_FILTER_ID = 7;
+
+ private static final String[] FILTER_NAMES = {
+ FILE_CHOOSER_DEMO_FILTER_BLUR,
+ FILE_CHOOSER_DEMO_FILTER_EDGE,
+ FILE_CHOOSER_DEMO_FILTER_SHARPEN,
+ FILE_CHOOSER_DEMO_FILTER_DARKEN,
+ FILE_CHOOSER_DEMO_FILTER_BRIGHTEN,
+ FILE_CHOOSER_DEMO_FILTER_LESSCONTRAST,
+ FILE_CHOOSER_DEMO_FILTER_MORECONTRAST,
+ FILE_CHOOSER_DEMO_FILTER_GRAY
+ };
+
+ private static final BufferedImageOp[] FILTER_OPERATIONS = {
+ new ConvolveOp(new Kernel(3, 3,
+ new float[]{.1111f, .1111f, .1111f, .1111f, .1111f, .1111f, .1111f, .1111f, .1111f}),
+ ConvolveOp.EDGE_NO_OP, null),
+ new ConvolveOp(new Kernel(3, 3,
+ new float[]{0.0f, -1.0f, 0.0f, -1.0f, 4.f, -1.0f, 0.0f, -1.0f, 0.0f}),
+ ConvolveOp.EDGE_NO_OP, null),
+ new ConvolveOp(new Kernel(3, 3,
+ new float[]{0.0f, -1.0f, 0.0f, -1.0f, 5.f, -1.0f, 0.0f, -1.0f, 0.0f}),
+ ConvolveOp.EDGE_NO_OP, null),
+ new RescaleOp(1, -5.0f, null),
+ new RescaleOp(1, 5.0f, null),
+ new RescaleOp(0.9f, 0, null),
+ new RescaleOp(1.1f, 0, null),
+ new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY), null)
+ };
+
+ private final JLabel lbImage = new JLabel(resourceManager
+ .getString(FILE_CHOOSER_DEMO_IMAGE_TEXT), JLabel.CENTER);
+
+ private final JScrollPane pnImage = new JScrollPane(lbImage);
+
+ private final JButton btnSelect = new JButton(FILE_CHOOSER_DEMO_SELECT_TEXT);
+
+ private final JButton btnSelectWithPreview = new JButton(FILE_CHOOSER_DEMO_SELECT_WITH_PREVIEW);
+
+ private final JComboBox cbFilters = new JComboBox();
+
+ private final JButton btnApplyFilter = createButton("apply.png", FILE_CHOOSER_DEMO_APPLY_FILTER_TOOLTIP);
+
+ private final JButton btnRotateLeft = createButton("rotateleft.png", FILE_CHOOSER_DEMO_ROTATE_LEFT_TOOLTIP);
+
+ private final JButton btnRotateRight = createButton("rotateright.png", FILE_CHOOSER_DEMO_ROTATE_RIGHT_TOOLTIP);
+
+ private final JButton btnFlipHorizontal = createButton("fliphor.png", FILE_CHOOSER_DEMO_FLIP_HORIZONTAL_TOOLTIP);
+
+ private final JButton btnFlipVertical = createButton("flipvert.png", FILE_CHOOSER_DEMO_FLIP_VERTICAL_TOOLTIP);
+
+ private final JButton btnSave = new JButton(FILE_CHOOSER_DEMO_SAVE_TEXT);
+
+ private final JButton btnCancel = new JButton(FILE_CHOOSER_DEMO_CANCEL_TEXT);
+
+ private final JFileChooser externalChooser = new JFileChooser(new File("."));
+
+ private final JFileChooser embeddedChooser = new JFileChooser(new File("."));
+
+ private final JGridPanel pnContent = new JGridPanel(1, 0, 0);
+
+ private State state;
+
+ private boolean fileChoosing;
+
+ private File file;
+
+ private BufferedImage image;
+
+ /**
+ * main method allows us to run as a standalone demo.
+ */
+ public static void main(String[] args) {
+ JFrame frame = new JFrame(FileChooserDemo.class.getAnnotation(DemoProperties.class).value());
+
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.getContentPane().add(new FileChooserDemo());
+ frame.setPreferredSize(new Dimension(800, 600));
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ /**
+ * FileChooserDemo Constructor
+ */
+ public FileChooserDemo() {
+ setLayout(new BorderLayout());
+
+ initUI();
+
+ embeddedChooser.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (JFileChooser.APPROVE_SELECTION.equals(e.getActionCommand())) {
+ loadFile(embeddedChooser.getSelectedFile());
+ }
+
+ if (JFileChooser.CANCEL_SELECTION.equals(e.getActionCommand())) {
+ setState(state, false);
+ }
+ }
+ });
+
+ btnSelect.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (fileChoosing) {
+ loadFile(embeddedChooser.getSelectedFile());
+ } else {
+ setState(state, true);
+ }
+ }
+ });
+
+ btnSelectWithPreview.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (externalChooser.showOpenDialog(FileChooserDemo.this) == JFileChooser.APPROVE_OPTION) {
+ loadFile(externalChooser.getSelectedFile());
+ }
+ }
+ });
+
+ btnApplyFilter.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ lastAppliedFilterId = ((FilterItem) cbFilters.getSelectedItem()).getId();
+ doFilter(FILTER_OPERATIONS[lastAppliedFilterId]);
+
+ }
+ });
+
+ btnRotateLeft.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ doAffineTransform(image.getHeight(), image.getWidth(),
+ new AffineTransform(0, -1, 1, 0, 0, image.getWidth()));
+ rotateLeftCount++;
+ }
+ });
+
+ btnRotateRight.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ doAffineTransform(image.getHeight(), image.getWidth(),
+ new AffineTransform(0, 1, -1, 0, image.getHeight(), 0));
+ rotateRightCount++;
+ }
+ });
+
+ btnFlipHorizontal.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ doAffineTransform(image.getWidth(), image.getHeight(),
+ new AffineTransform(-1, 0, 0, 1, image.getWidth(), 0));
+ flipHorizontalCount++;
+ }
+ });
+
+ btnFlipVertical.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ doAffineTransform(image.getWidth(), image.getHeight(),
+ new AffineTransform(1, 0, 0, -1, 0, image.getHeight()));
+ flipVerticalCount++;
+ }
+ });
+
+ btnSave.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ if (JOptionPane.showConfirmDialog(FileChooserDemo.this,
+ resourceManager.getString(FILE_CHOOSER_DEMO_SAVEQUESTION_MESSAGE),
+ FILE_CHOOSER_DEMO_SAVEQUESTION_TITLE,
+ JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
+ return;
+ }
+
+ String fileName = file.getName();
+
+ int i = fileName.lastIndexOf('.');
+
+ try {
+ ImageIO.write(image, fileName.substring(i + 1), file);
+
+ setState(State.IMAGE_LOADED, false);
+ } catch (IOException e1) {
+ JOptionPane.showMessageDialog(FileChooserDemo.this,
+ MessageFormat.format(resourceManager
+ .getString(FILE_CHOOSER_DEMO_ERRORSAVEFILE_MESSAGE), e1),
+ resourceManager.getString(FILE_CHOOSER_DEMO_ERRORSAVEFILE_TITLE),
+ JOptionPane.ERROR_MESSAGE);
+ }
+ }
+ });
+
+ btnCancel.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ loadFile(file);
+ }
+ });
+ }
+
+ private void initUI() {
+ externalChooser.addChoosableFileFilter(new FileNameExtensionFilter(JPEG_IMAGES, JPG));
+ externalChooser.addChoosableFileFilter(new FileNameExtensionFilter(ALL_SUPPORTED_IMAGES,
+ ImageIO.getWriterFormatNames()));
+
+ final FilePreview filePreview = new FilePreview();
+
+ externalChooser.setAccessory(filePreview);
+ externalChooser.addPropertyChangeListener(JFileChooser.SELECTED_FILE_CHANGED_PROPERTY,
+ new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ filePreview.loadFileInfo(externalChooser.getSelectedFile());
+ }
+ });
+
+ embeddedChooser.setControlButtonsAreShown(false);
+
+ embeddedChooser.addChoosableFileFilter(new FileNameExtensionFilter(JPEG_IMAGES, JPG));
+
+ FileNameExtensionFilter filter = new FileNameExtensionFilter(ALL_SUPPORTED_IMAGES,
+ ImageIO.getWriterFormatNames());
+
+ embeddedChooser.addChoosableFileFilter(filter);
+ embeddedChooser.setFileFilter(filter);
+
+ for (int i = MIN_FILTER_ID; i <= MAX_FILTER_ID; i++) {
+ cbFilters.addItem(new FilterItem(i, resourceManager.getString(FILTER_NAMES[i])));
+ }
+
+ JGridPanel pnFilter = new JGridPanel(2, 0);
+
+ pnFilter.cell(cbFilters).
+ cell(btnApplyFilter);
+
+ JGridPanel pnRotateButtons = new JGridPanel(4, 3);
+
+ pnRotateButtons.cell(btnRotateLeft).
+ cell(btnRotateRight).
+ cell(btnFlipHorizontal).
+ cell(btnFlipVertical);
+
+ JGridPanel pnBottom = new JGridPanel(4, 1);
+
+ pnBottom.setHGap(JGridPanel.DEFAULT_GAP * 4);
+
+ pnBottom.cell(btnSelect, JGridPanel.Layout.FILL).
+ cell().
+ cell(pnFilter).
+ cell(btnSave, JGridPanel.Layout.FILL).
+ cell(btnSelectWithPreview, JGridPanel.Layout.FILL).
+ cell().
+ cell(pnRotateButtons).
+ cell(btnCancel, JGridPanel.Layout.FILL);
+
+ pnContent.cell(pnImage);
+ pnContent.cell(pnBottom, new Insets(10, 10, 10, 10));
+
+ add(pnContent);
+
+ setState(State.EMPTY, false);
+ }
+
+ private JButton createButton(String image, String toolTip) {
+ JButton res = new JButton(resourceManager.createImageIcon(image, null));
+
+ res.setPreferredSize(new Dimension(26, 26));
+ res.setMinimumSize(new Dimension(26, 26));
+ res.setToolTipText(resourceManager.getString(toolTip));
+
+ return res;
+ }
+
+ private void doAffineTransform(int width, int height, AffineTransform transform) {
+ BufferedImage newImage = new BufferedImage(image.getColorModel(),
+ image.getRaster().createCompatibleWritableRaster(width, height),
+ image.isAlphaPremultiplied(), new Hashtable<Object, Object>());
+
+ ((Graphics2D) newImage.getGraphics()).drawRenderedImage(image, transform);
+
+ image = newImage;
+
+ lbImage.setIcon(new ImageIcon(image));
+
+ setState(State.IMAGE_CHANGED, false);
+ }
+
+ private void doFilter(BufferedImageOp imageOp) {
+ BufferedImage newImage = new BufferedImage(image.getColorModel(),
+ image.getRaster().createCompatibleWritableRaster(image.getWidth(), image.getHeight()),
+ image.isAlphaPremultiplied(), new Hashtable<Object, Object>());
+
+ imageOp.filter(image, newImage);
+
+ image = newImage;
+
+ lbImage.setIcon(new ImageIcon(image));
+
+ setState(State.IMAGE_CHANGED, false);
+ }
+
+ private void loadFile(File file) {
+ if (file == null) {
+ JOptionPane.showMessageDialog(this,
+ resourceManager.getString(FILE_CHOOSER_DEMO_SELECTFILE_MESSAGE),
+ resourceManager.getString(FILE_CHOOSER_DEMO_SELECTFILE_TITLE),
+ JOptionPane.INFORMATION_MESSAGE);
+
+ return;
+ }
+
+ try {
+ image = ImageIO.read(file);
+
+ if (image != null) {
+ lbImage.setText(null);
+ lbImage.setIcon(new ImageIcon(image));
+
+ this.file = file;
+
+ setState(State.IMAGE_LOADED, false);
+
+ return;
+ }
+ } catch (IOException e1) {
+ // Do nothing
+ }
+
+ JOptionPane.showMessageDialog(this,
+ resourceManager.getString(FILE_CHOOSER_DEMO_ERRORLOADFILE_MESSAGE),
+ resourceManager.getString(FILE_CHOOSER_DEMO_ERRORLOADFILE_TITLE),
+ JOptionPane.ERROR_MESSAGE);
+ }
+
+ private void setState(State state, boolean fileChoosing) {
+ if (this.fileChoosing != fileChoosing) {
+ pnContent.setComponent(fileChoosing ? embeddedChooser : pnImage, 0, 0);
+ }
+
+ this.state = state;
+ this.fileChoosing = fileChoosing;
+
+ btnSelectWithPreview.setEnabled(!fileChoosing);
+
+ boolean isImageLoaded = !fileChoosing && state != State.EMPTY;
+
+ cbFilters.setEnabled(isImageLoaded);
+ btnApplyFilter.setEnabled(isImageLoaded);
+ btnRotateRight.setEnabled(isImageLoaded);
+ btnRotateLeft.setEnabled(isImageLoaded);
+ btnFlipHorizontal.setEnabled(isImageLoaded);
+ btnFlipVertical.setEnabled(isImageLoaded);
+
+ boolean isImageChanged = !fileChoosing && state == State.IMAGE_CHANGED;
+
+ btnSave.setEnabled(isImageChanged);
+ btnCancel.setEnabled(isImageChanged);
+ }
+
+ public static int getRotateLeftCount() {
+ return rotateLeftCount;
+ }
+
+ public static int getRotateRightCount() {
+ return rotateRightCount;
+ }
+
+ public static int getFlipHorizontalCount() {
+ return flipHorizontalCount;
+ }
+
+ public static int getFlipVerticalCount() {
+ return flipVerticalCount;
+ }
+
+ public static int getLastAppliedFilterId() {
+ return lastAppliedFilterId;
+ }
+
+ private static class FilterItem {
+
+ /**
+ * 0 - blur 1 - edge 2 - sharpen 3 - darken 4 - brighten 5 - less
+ * contrast 6 - more contrast 7 - gray
+ */
+ private final int id;
+
+ private final String name;
+
+ private FilterItem(int id, String name) {
+ assert id >= MIN_FILTER_ID && id <= MAX_FILTER_ID;
+
+ this.id = id;
+ this.name = name;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public String toString() {
+ return name;
+ }
+ }
+
+ private enum FileType {
+
+ IMAGE
+ }
+
+ private class FilePreview extends JGridPanel {
+
+ private static final int SIZE = 200;
+
+ private final JLabel lbType = new JLabel();
+
+ private final JLabel lbSize = new JLabel();
+
+ private final JLabel lbPreview = new JLabel(resourceManager
+ .getString(FILE_CHOOSER_DEMO_PREVIEW_EMPTY_TEXT), JLabel.CENTER);
+
+ private final Map<String, FileType> knownTypes = new HashMap<String, FileType>();
+
+ public FilePreview() {
+ super(1, 0, 1);
+
+ for (String s : ImageIO.getWriterFormatNames()) {
+ knownTypes.put(s.toLowerCase(), FileType.IMAGE);
+ }
+
+ initUI();
+ }
+
+ public void loadFileInfo(File file) {
+ boolean emptyPreview = true;
+
+ if (file == null) {
+ lbType.setText(null);
+ lbSize.setText(null);
+ } else {
+ lbType.setText(externalChooser.getFileSystemView().getSystemTypeDescription(file));
+ lbSize.setText(Long.toString(file.length()));
+
+ String fileName = file.getName();
+
+ int i = fileName.lastIndexOf(".");
+
+ String ext = i < 0 ? null : fileName.substring(i + 1);
+
+ FileType fileType = knownTypes.get(ext.toLowerCase());
+
+ if (fileType != null) {
+ switch (fileType) {
+ case IMAGE:
+ try {
+ BufferedImage image = ImageIO.read(file);
+
+ double coeff = Math.min(((double) SIZE) / image.getWidth(),
+ ((double) SIZE) / image.getHeight());
+
+ BufferedImage scaledImage = new BufferedImage(
+ (int) Math.round(image.getWidth() * coeff),
+ (int) Math.round(image.getHeight() * coeff),
+ BufferedImage.TYPE_INT_RGB);
+
+ Graphics2D g = (Graphics2D) scaledImage.getGraphics();
+
+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ g.drawImage(image, 0, 0, scaledImage.getWidth(), scaledImage.getHeight(), null);
+
+ lbPreview.setText(null);
+ lbPreview.setIcon(new ImageIcon(scaledImage));
+
+ setComponent(lbPreview, 0, 1);
+
+ emptyPreview = false;
+ } catch (IOException e) {
+ // Empty preview
+ }
+
+ break;
+ }
+ }
+ }
+
+ if (emptyPreview) {
+ lbPreview.setIcon(null);
+ lbPreview.setText(resourceManager.getString(FILE_CHOOSER_DEMO_PREVIEW_EMPTY_TEXT));
+
+ setComponent(lbPreview, 0, 1);
+ }
+ }
+
+ private void initUI() {
+ setPreferredSize(new Dimension(SIZE, -1));
+
+ setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+
+ JGridPanel pnInfo = new JGridPanel(2, 1);
+
+ pnInfo.cell(new JLabel(resourceManager.getString(FILE_CHOOSER_DEMO_PREVIEW_TYPE))).
+ cell(lbType).
+ cell(new JLabel(resourceManager.getString(FILE_CHOOSER_DEMO_PREVIEW_SIZE))).
+ cell(lbSize);
+
+ cell(pnInfo);
+ cell(lbPreview, Layout.FILL, Layout.FILL);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/FileChooserDemo.properties Wed Oct 24 13:35:18 2018 +0530
@@ -0,0 +1,38 @@
+### FileChooser Demo ###
+
+FileChooserDemo.image.text = Click the Select image button to select an image
+FileChooserDemo.select.text = Select image
+FileChooserDemo.selectwithpreview.text = Select with preview
+FileChooserDemo.save.text = Save
+FileChooserDemo.cancel.text = Cancel
+
+FileChooserDemo.filter.blur = blur
+FileChooserDemo.filter.edge = edge
+FileChooserDemo.filter.sharpen = sharpen
+FileChooserDemo.filter.darken = darken
+FileChooserDemo.filter.brighten = brighten
+FileChooserDemo.filter.lesscontrast = less contrast
+FileChooserDemo.filter.morecontrast = more contrast
+FileChooserDemo.filter.gray = gray
+
+FileChooserDemo.applyfilter.tooltip = Apply filter
+FileChooserDemo.rotateleft.tooltip = Rotate left
+FileChooserDemo.rotateright.tooltip = Rotate right
+FileChooserDemo.fliphorizontal.tooltip = Flip horizontal
+FileChooserDemo.flipvertical.tooltip = Flip vertical
+
+FileChooserDemo.preview.type = Type:
+FileChooserDemo.preview.size = Size:
+FileChooserDemo.preview.emptytext = Preview area
+
+FileChooserDemo.selectfile.title = Information
+FileChooserDemo.selectfile.message = Select a valid image file please
+
+FileChooserDemo.savequestion.title = Confirmation
+FileChooserDemo.savequiestion.message = Do you really want to save changes?
+
+FileChooserDemo.errorloadfile.title = Error
+FileChooserDemo.errorloadfile.message = Cannot load file
+
+FileChooserDemo.errorsavefile.title = Error
+FileChooserDemo.errorsavefile.message = Cannot save file: {0}
Binary file test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/FileChooserDemo.gif has changed
Binary file test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/apply.png has changed
Binary file test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/fliphor.png has changed
Binary file test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/flipvert.png has changed
Binary file test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/rotateleft.png has changed
Binary file test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/filechooser/resources/images/rotateright.png has changed