Skip to content

Commit d8e55dc

Browse files
dbwiddisdbwiddis
authored
Use JDK7 and JDK8 Code Features in Platform mappings (#1565)
* Use Diamond Operator except for anonymous inner classes * Use try-with-resources * Use Multi-catch * Use constants for system properties
1 parent 9e5243f commit d8e55dc

55 files changed

Lines changed: 164 additions & 197 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎contrib/platform/src/com/sun/jna/platform/EnumUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static <E extends Enum<E>> E fromInteger(int idx, Class<E> clazz)
8282
public static <T extends FlagEnum> Set<T> setFromInteger(int flags, Class<T> clazz)
8383
{
8484
T[] vals = clazz.getEnumConstants();
85-
Set<T> result = new HashSet<T>();
85+
Set<T> result = new HashSet<>();
8686

8787
for (T val : vals)
8888
{

‎contrib/platform/src/com/sun/jna/platform/FileMonitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public String toString() {
7474
}
7575
}
7676

77-
private final Map<File, Integer> watched = new HashMap<File, Integer>();
78-
private List<FileListener> listeners = new ArrayList<FileListener>();
77+
private final Map<File, Integer> watched = new HashMap<>();
78+
private List<FileListener> listeners = new ArrayList<>();
7979

8080
protected abstract void watch(File file, int mask, boolean recursive) throws IOException ;
8181
protected abstract void unwatch(File file);
@@ -107,13 +107,13 @@ protected void notify(FileEvent e) {
107107
}
108108

109109
public synchronized void addFileListener(FileListener listener) {
110-
List<FileListener> list = new ArrayList<FileListener>(listeners);
110+
List<FileListener> list = new ArrayList<>(listeners);
111111
list.add(listener);
112112
listeners = list;
113113
}
114114

115115
public synchronized void removeFileListener(FileListener x) {
116-
List<FileListener> list = new ArrayList<FileListener>(listeners);
116+
List<FileListener> list = new ArrayList<>(listeners);
117117
list.remove(x);
118118
listeners = list;
119119
}

‎contrib/platform/src/com/sun/jna/platform/FileUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void moveToTrash(File... files) throws IOException {
104104
if (!trash.exists()) {
105105
throw new IOException("No trash location found (define fileutils.trash to be the path to the trash)");
106106
}
107-
List<File> failed = new ArrayList<File>();
107+
List<File> failed = new ArrayList<>();
108108
for (int i=0;i < files.length;i++) {
109109
File src = files[i];
110110
File target = new File(trash, src.getName());

‎contrib/platform/src/com/sun/jna/platform/RasterRangesUtils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ public static boolean outputOccupiedRanges(Raster raster, RangesOutput out) {
128128
* @return true if the output succeeded, false otherwise
129129
*/
130130
public static boolean outputOccupiedRangesOfBinaryPixels(byte[] binaryBits, int w, int h, RangesOutput out) {
131-
Set<Rectangle> rects = new HashSet<Rectangle>();
131+
Set<Rectangle> rects = new HashSet<>();
132132
Set<Rectangle> prevLine = Collections.<Rectangle>emptySet();
133133
int scanlineBytes = binaryBits.length / h;
134134
for (int row = 0; row < h; row++) {
135-
Set<Rectangle> curLine = new TreeSet<Rectangle>(COMPARATOR);
135+
Set<Rectangle> curLine = new TreeSet<>(COMPARATOR);
136136
int rowOffsetBytes = row * scanlineBytes;
137137
int startCol = -1;
138138
// Look at each batch of 8 columns in this row
@@ -201,10 +201,10 @@ public static boolean outputOccupiedRangesOfBinaryPixels(byte[] binaryBits, int
201201
* @return true if the output succeeded, false otherwise
202202
*/
203203
public static boolean outputOccupiedRanges(int[] pixels, int w, int h, int occupationMask, RangesOutput out) {
204-
Set<Rectangle> rects = new HashSet<Rectangle>();
204+
Set<Rectangle> rects = new HashSet<>();
205205
Set<Rectangle> prevLine = Collections.<Rectangle>emptySet();
206206
for (int row = 0; row < h; row++) {
207-
Set<Rectangle> curLine = new TreeSet<Rectangle>(COMPARATOR);
207+
Set<Rectangle> curLine = new TreeSet<>(COMPARATOR);
208208
int idxOffset = row * w;
209209
int startCol = -1;
210210

@@ -241,7 +241,7 @@ public static boolean outputOccupiedRanges(int[] pixels, int w, int h, int occup
241241
}
242242

243243
private static Set<Rectangle> mergeRects(Set<Rectangle> prev, Set<Rectangle> current) {
244-
Set<Rectangle> unmerged = new HashSet<Rectangle>(prev);
244+
Set<Rectangle> unmerged = new HashSet<>(prev);
245245
if (!prev.isEmpty() && !current.isEmpty()) {
246246
Rectangle[] pr = prev.toArray(new Rectangle[0]);
247247
Rectangle[] cr = current.toArray(new Rectangle[0]);

‎contrib/platform/src/com/sun/jna/platform/WindowUtils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,9 +1043,9 @@ private void setMask(final Component w, final Area area) {
10431043
int mode = pi.getWindingRule() == PathIterator.WIND_NON_ZERO
10441044
? WinGDI.WINDING: WinGDI.ALTERNATE;
10451045
float[] coords = new float[6];
1046-
List<POINT> points = new ArrayList<POINT>();
1046+
List<POINT> points = new ArrayList<>();
10471047
int size = 0;
1048-
List<Integer> sizes = new ArrayList<Integer>();
1048+
List<Integer> sizes = new ArrayList<>();
10491049
while (!pi.isDone()) {
10501050
int type = pi.currentSegment(coords);
10511051
if (type == PathIterator.SEG_MOVETO) {
@@ -1239,7 +1239,7 @@ public Dimension getIconSize(final HICON hIcon) {
12391239

12401240
@Override
12411241
public List<DesktopWindow> getAllWindows(final boolean onlyVisibleWindows) {
1242-
final List<DesktopWindow> result = new LinkedList<DesktopWindow>();
1242+
final List<DesktopWindow> result = new LinkedList<>();
12431243

12441244
final WNDENUMPROC lpEnumFunc = new WNDENUMPROC() {
12451245
@Override
@@ -1576,7 +1576,7 @@ private static Pixmap createBitmap(final Display dpy,
15761576
}
15771577
x11.XSetForeground(dpy, gc, new NativeLong(0));
15781578
x11.XFillRectangle(dpy, pm, gc, 0, 0, width, height);
1579-
final List<Rectangle> rlist = new ArrayList<Rectangle>();
1579+
final List<Rectangle> rlist = new ArrayList<>();
15801580
try {
15811581
RasterRangesUtils.outputOccupiedRanges(raster, new RasterRangesUtils.RangesOutput() {
15821582
@Override
@@ -1686,7 +1686,7 @@ private synchronized long[] getAlphaVisualIDs() {
16861686
IntByReference pcount = new IntByReference();
16871687
info = x11.XGetVisualInfo(dpy, mask, template, pcount);
16881688
if (info != null) {
1689-
List<X11.VisualID> list = new ArrayList<X11.VisualID>();
1689+
List<X11.VisualID> list = new ArrayList<>();
16901690
XVisualInfo[] infos =
16911691
(XVisualInfo[])info.toArray(pcount.getValue());
16921692
for (int i = 0; i < infos.length; i++) {

‎contrib/platform/src/com/sun/jna/platform/bsd/ExtAttrUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void delete(String path, String name) throws IOException {
9595
}
9696

9797
private static List<String> decodeStringList(ByteBuffer buffer) {
98-
List<String> list = new ArrayList<String>();
98+
List<String> list = new ArrayList<>();
9999

100100
while (buffer.hasRemaining()) {
101101
int length = buffer.get() & 0xFF;

‎contrib/platform/src/com/sun/jna/platform/dnd/DropHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ public void drop(DropTargetDropEvent e) {
388388
* @return whether any of the given flavors are supported
389389
*/
390390
protected boolean isSupported(DataFlavor[] flavors) {
391-
Set<DataFlavor> set = new HashSet<DataFlavor>(Arrays.asList(flavors));
391+
Set<DataFlavor> set = new HashSet<>(Arrays.asList(flavors));
392392
set.retainAll(acceptedFlavors);
393393
return !set.isEmpty();
394394
}

‎contrib/platform/src/com/sun/jna/platform/linux/LibC.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Sysinfo extends Structure {
7373
*/
7474
@Override
7575
protected List<Field> getFieldList() {
76-
List<Field> fields = new ArrayList<Field>(super.getFieldList());
76+
List<Field> fields = new ArrayList<>(super.getFieldList());
7777
if (PADDING_SIZE == 0) {
7878
Iterator<Field> fieldIterator = fields.iterator();
7979
while (fieldIterator.hasNext()) {
@@ -88,7 +88,7 @@ protected List<Field> getFieldList() {
8888

8989
@Override
9090
protected List<String> getFieldOrder() {
91-
List<String> fieldOrder = new ArrayList<String>(super.getFieldOrder());
91+
List<String> fieldOrder = new ArrayList<>(super.getFieldOrder());
9292
if (PADDING_SIZE == 0) {
9393
fieldOrder.remove("_f");
9494
}
@@ -122,7 +122,7 @@ class Statvfs extends Structure {
122122
*/
123123
@Override
124124
protected List<Field> getFieldList() {
125-
List<Field> fields = new ArrayList<Field>(super.getFieldList());
125+
List<Field> fields = new ArrayList<>(super.getFieldList());
126126
if (NativeLong.SIZE > 4) {
127127
Iterator<Field> fieldIterator = fields.iterator();
128128
while (fieldIterator.hasNext()) {
@@ -137,7 +137,7 @@ protected List<Field> getFieldList() {
137137

138138
@Override
139139
protected List<String> getFieldOrder() {
140-
List<String> fieldOrder = new ArrayList<String>(super.getFieldOrder());
140+
List<String> fieldOrder = new ArrayList<>(super.getFieldOrder());
141141
if (NativeLong.SIZE > 4) {
142142
fieldOrder.remove("_f_unused");
143143
}

‎contrib/platform/src/com/sun/jna/platform/linux/XAttrUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ public static void fRemoveXAttr(int fd, String name) throws IOException {
657657
private static Collection<String> splitBufferToStrings(byte[] valueMem, String encoding)
658658
throws IOException {
659659
final Charset charset = Charset.forName(encoding);
660-
final Set<String> attributesList = new LinkedHashSet<String>(1);
660+
final Set<String> attributesList = new LinkedHashSet<>(1);
661661
int offset = 0;
662662
for(int i = 0; i < valueMem.length; i++) {
663663
// each entry is terminated by a single \0 byte

‎contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class FSRef extends Structure {
6969

7070
@Override
7171
public void moveToTrash(File... files) throws IOException {
72-
List<String> failed = new ArrayList<String>();
72+
List<String> failed = new ArrayList<>();
7373
for (File src: files) {
7474
FileManager.FSRef fsref = new FileManager.FSRef();
7575
int status = FileManager.INSTANCE.FSPathMakeRefWithOptions(src.getAbsolutePath(),

0 commit comments

Comments
 (0)