diff options
author | Alexander Kurtakov | 2015-07-31 15:44:30 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2015-07-31 15:44:30 +0000 |
commit | f5cbd382382160f6fc3a985bfa01f15f4283be91 (patch) | |
tree | f83fb9d6c1b310993fdf5e0f0d678a1421ae3a25 /examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics | |
parent | b7a20520e8a44365939c3ea67e7c866d1a1154c0 (diff) | |
download | eclipse.platform.swt-f5cbd382382160f6fc3a985bfa01f15f4283be91.tar.gz eclipse.platform.swt-f5cbd382382160f6fc3a985bfa01f15f4283be91.tar.xz eclipse.platform.swt-f5cbd382382160f6fc3a985bfa01f15f4283be91.zip |
Bug 474049 - Move examples to Java 1.7
Bump BREE, change compiler settings, remove redundant type parameters.
Change-Id: I80e4b39465d8b3833b8d10219e4b4b75f7688488
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics')
6 files changed, 17 insertions, 17 deletions
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java index e4daad9396..a48d544cea 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/BallTab.java @@ -48,8 +48,8 @@ public class BallTab extends AnimatedGraphicsTab { this.incY = incY; this.ball_size = ball_size; this.capacity = capacity; - prevx = new LinkedList<Float>(); - prevy = new LinkedList<Float>(); + prevx = new LinkedList<>(); + prevy = new LinkedList<>(); this.colors = colors; } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/ColorMenu.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/ColorMenu.java index 1f4968eeaa..70a7568a2f 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/ColorMenu.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/ColorMenu.java @@ -273,7 +273,7 @@ public class ColorMenu { public MenuItemListener(Control parent){ this.parent = parent; - resources = new ArrayList<Resource>(); + resources = new ArrayList<>(); } /** * Method used to set the ColorListener @@ -298,7 +298,7 @@ public class ColorMenu { for (int i = 0; i < resources.size(); i++) { resources.get(i).dispose(); } - resources = new ArrayList<Resource>(); + resources = new ArrayList<>(); break; case SWT.Selection: Display display = event.display; diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/CustomFontTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/CustomFontTab.java index be628cb1d4..7fa47a2b1c 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/CustomFontTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/CustomFontTab.java @@ -55,7 +55,7 @@ public CustomFontTab(GraphicsExample example) { // create list of fonts for this platform FontData [] fontData = Display.getCurrent().getFontList(null, true); - fontNames = new ArrayList<String>(); + fontNames = new ArrayList<>(); for (int i=0; i < fontData.length; i++) { // remove duplicates and sort String nextName = fontData[i].getName(); diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java index 290d5c0cbc..e1ced08eaa 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientDialog.java @@ -62,7 +62,7 @@ public class GradientDialog extends Dialog { super(parent, style); rgb1 = rgb2 = null; returnVal = SWT.CANCEL; - resources = new ArrayList<Image>(); + resources = new ArrayList<>(); } /** diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java index a9364fa399..7eb3242048 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GraphicsExample.java @@ -15,8 +15,8 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; -import java.util.List; import java.util.HashSet; +import java.util.List; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -91,7 +91,7 @@ public GraphicsExample() { public GraphicsExample(final Composite parent) { this.parent = parent; - resources = new ArrayList<Image>(); + resources = new ArrayList<>(); createControls(parent); setTab(tab); startAnimationTimer(); @@ -416,7 +416,7 @@ void createTabList(Composite parent) { return tab0.getText().compareTo(tab1.getText()); } }); - HashSet<String> set = new HashSet<String>(); + HashSet<String> set = new HashSet<>(); for (GraphicsTab tab : tabs) { set.add(tab.getCategory()); } @@ -427,7 +427,7 @@ void createTabList(Composite parent) { TreeItem item = new TreeItem(tabList, SWT.NONE); item.setText(text); } - tabs_in_order = new ArrayList<GraphicsTab>(); + tabs_in_order = new ArrayList<>(); TreeItem[] items = tabList.getItems(); for (TreeItem item : items) { for (GraphicsTab tab : tabs) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/MazeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/MazeTab.java index 0b500bd299..c6e8fed311 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/MazeTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/MazeTab.java @@ -43,7 +43,7 @@ public MazeTab(GraphicsExample example) { super(example); // correct path - nextCoord = new ArrayList<Integer>(); + nextCoord = new ArrayList<>(); nextCoord.addAll(moveDown(20, -50, 20, 110, 10)); nextCoord.addAll(moveRight(30, 110, 130, 110, 10)); nextCoord.addAll(moveUp(135, 100, 135, 15, 10)); @@ -67,7 +67,7 @@ public MazeTab(GraphicsExample example) { ycoord = nextCoord.get(nextIndex+1).intValue(); // wrong path 1 - nextCoord2 = new ArrayList<Integer>(); + nextCoord2 = new ArrayList<>(); nextCoord2.addAll(moveDown(20, -25, 20, 110, 10)); nextCoord2.addAll(moveRight(30, 110, 130, 110, 10)); nextCoord2.addAll(moveUp(135, 100, 135, 15, 10)); @@ -80,7 +80,7 @@ public MazeTab(GraphicsExample example) { ycoord2 = nextCoord2.get(nextIndex2+1).intValue(); // wrong path 2 - nextCoord3 = new ArrayList<Integer>(); + nextCoord3 = new ArrayList<>(); nextCoord3.addAll(moveDown(20, 0, 20, 110, 10)); nextCoord3.addAll(moveRight(30, 110, 130, 110, 10)); nextCoord3.addAll(moveUp(135, 100, 135, 15, 10)); @@ -240,7 +240,7 @@ public void paint(GC gc, int width, int height) { * The number of pixels that separate each coordinate */ private List<Integer> moveLeft(int x1, int y1, int x2, int y2, int stepsize) { - List<Integer> coords = new ArrayList<Integer>(); + List<Integer> coords = new ArrayList<>(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(x1 - stepsize > x2) { @@ -269,7 +269,7 @@ private List<Integer> moveLeft(int x1, int y1, int x2, int y2, int stepsize) { * The number of pixels that separate each coordinate */ private List<Integer> moveRight(int x1, int y1, int x2, int y2, int stepsize) { - List<Integer> coords = new ArrayList<Integer>(); + List<Integer> coords = new ArrayList<>(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(x1 + stepsize < x2) { @@ -298,7 +298,7 @@ private List<Integer> moveRight(int x1, int y1, int x2, int y2, int stepsize) { * The number of pixels that separate each coordinate */ private List<Integer> moveUp(int x1, int y1, int x2, int y2, int stepsize) { - List<Integer> coords = new ArrayList<Integer>(); + List<Integer> coords = new ArrayList<>(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(y1 - stepsize > y2) { @@ -327,7 +327,7 @@ private List<Integer> moveUp(int x1, int y1, int x2, int y2, int stepsize) { * The number of pixels that separate each coordinate */ private List<Integer> moveDown(int x1, int y1, int x2, int y2, int stepsize) { - List<Integer> coords = new ArrayList<Integer>(); + List<Integer> coords = new ArrayList<>(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(y1 + stepsize < y2) { |