Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2016-02-10 08:53:00 +0000
committerAlexander Kurtakov2016-02-10 08:53:00 +0000
commitf630dc108c2bf4c2a6acf030b19966c7ed1a68af (patch)
treef6cfe04df2fec8ee2cb4c8e889d39254f53c8abb /bundles/org.eclipse.swt/Eclipse SWT OLE Win32
parent0b3de15c83fddb6e45d1372ffdf88504e8951d1e (diff)
downloadeclipse.platform.swt-f630dc108c2bf4c2a6acf030b19966c7ed1a68af.tar.gz
eclipse.platform.swt-f630dc108c2bf4c2a6acf030b19966c7ed1a68af.tar.xz
eclipse.platform.swt-f630dc108c2bf4c2a6acf030b19966c7ed1a68af.zip
Bug 487556 - Remove redundant type parematers
Useless now that SWT requires Java 1.7. Change-Id: I333df3b7f2d706a66ba4e959ec508a762cac0c1d Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT OLE Win32')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java
index eb5608e0d8..7ec3047ed8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,7 +23,7 @@ public class COMObject {
static private final int MAX_ARG_COUNT = 12;
static private final int MAX_VTABLE_LENGTH = 80;
static private Callback[][] Callbacks = new Callback[MAX_VTABLE_LENGTH][MAX_ARG_COUNT];
- static private Map<LONG, COMObject> ObjectMap = new HashMap<LONG, COMObject>();
+ static private Map<LONG, COMObject> ObjectMap = new HashMap<>();
public COMObject(int[] argCounts) {
long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
index cdf133a7ff..5e2f9e7800 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
@@ -657,7 +657,7 @@ private int RemoveMenus(long /*int*/ hmenuShared) {
long /*int*/ hMenu = menubar.handle;
- List<LONG> ids = new ArrayList<LONG>();
+ List<LONG> ids = new ArrayList<>();
if (this.fileMenuItems != null) {
for (int i = 0; i < this.fileMenuItems.length; i++) {
MenuItem item = this.fileMenuItems[i];

Back to the top