From af51c597ba7fbaa13b7c94807f1c546b9743b669 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 19 Nov 2013 13:31:34 +0200 Subject: SWT Examples - bump to Java 1.5. BREE set to 1.5 and generification done. Change-Id: I32dd2c90cf87a888a3b8ce97facc1968c06439c3 Signed-off-by: Alexander Kurtakov --- examples/org.eclipse.swt.examples/.classpath | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 13 +++--- .../org.eclipse.swt.examples/META-INF/MANIFEST.MF | 2 +- .../swt/examples/accessibility/BarChart.java | 2 +- .../swt/examples/addressbook/AddressBook.java | 15 +++---- .../examples/browserexample/BrowserExample.java | 2 +- .../examples/controlexample/ControlExample.java | 2 +- .../eclipse/swt/examples/controlexample/Tab.java | 14 ++++--- .../swt/examples/fileviewer/FileViewer.java | 12 +++--- .../eclipse/swt/examples/fileviewer/IconCache.java | 10 ++--- .../swt/examples/graphics/AdvancedGraphics.java | 2 +- .../org/eclipse/swt/examples/graphics/BallTab.java | 6 +-- .../eclipse/swt/examples/graphics/ColorMenu.java | 16 ++++---- .../swt/examples/graphics/CustomFontTab.java | 10 ++--- .../swt/examples/graphics/GradientDialog.java | 4 +- .../eclipse/swt/examples/graphics/GradientTab.java | 2 +- .../swt/examples/graphics/GraphicsExample.java | 24 +++++------ .../org/eclipse/swt/examples/graphics/MazeTab.java | 48 +++++++++++----------- .../eclipse/swt/examples/hoverhelp/HoverHelp.java | 2 +- .../swt/examples/imageanalyzer/ImageAnalyzer.java | 7 ++-- .../swt/examples/javaviewer/JavaLineStyler.java | 21 +++++----- .../swt/examples/javaviewer/JavaViewer.java | 6 +-- .../eclipse/swt/examples/layoutexample/Tab.java | 2 +- .../eclipse/swt/examples/paint/PaintExample.java | 2 +- .../swt/examples/paint/SegmentedPaintSession.java | 10 ++--- 25 files changed, 119 insertions(+), 119 deletions(-) (limited to 'examples') diff --git a/examples/org.eclipse.swt.examples/.classpath b/examples/org.eclipse.swt.examples/.classpath index b7464f3ca2..64c5e31b7a 100644 --- a/examples/org.eclipse.swt.examples/.classpath +++ b/examples/org.eclipse.swt.examples/.classpath @@ -1,7 +1,7 @@ - + - + diff --git a/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs index 2a57571e9c..416f4fb696 100644 --- a/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs +++ b/examples/org.eclipse.swt.examples/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,11 @@ -#Mon Dec 11 14:31:37 EST 2006 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF index cca1bd4747..4230750ad9 100644 --- a/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.103.0.qualifier Bundle-ClassPath: swtexamples.jar Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.swt.examples.accessibility, org.eclipse.swt.examples.addressbook, org.eclipse.swt.examples.browserexample, diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/BarChart.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/BarChart.java index c04c643f56..c538c265c0 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/BarChart.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/BarChart.java @@ -26,7 +26,7 @@ import org.eclipse.swt.accessibility.*; */ public class BarChart extends Canvas { static ResourceBundle bundle = ResourceBundle.getBundle("examples_accessibility"); - Vector data = new Vector(); + Vector data = new Vector(); String title; int color = SWT.COLOR_RED; int selectedItem = -1; diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java index 0cdb8864f4..480a9bb67b 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/addressbook/AddressBook.java @@ -849,7 +849,7 @@ private void createHelpMenu(Menu menuBar) { /** * To compare entries (rows) by the given column */ -private class RowComparator implements Comparator { +private class RowComparator implements Comparator { private int column; /** @@ -863,15 +863,12 @@ private class RowComparator implements Comparator { /** * Compares two rows (type String[]) using the specified * column entry. - * @param obj1 First row to compare - * @param obj2 Second row to compare - * @return negative if obj1 less than obj2, positive if - * obj1 greater than obj2, and zero if equal. + * @param row1 First row to compare + * @param row2 Second row to compare + * @return negative if row1 less than row2, positive if + * row1 greater than row2, and zero if equal. */ - public int compare(Object obj1, Object obj2) { - String[] row1 = (String[])obj1; - String[] row2 = (String[])obj2; - + public int compare(String[] row1, String[] row2) { return row1[column].compareTo(row2[column]); } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java index 824e58763f..e51b601571 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/browserexample/BrowserExample.java @@ -319,7 +319,7 @@ public class BrowserExample { * Loads the resources */ void initResources() { - final Class clazz = this.getClass(); + final Class clazz = this.getClass(); if (resourceBundle != null) { try { if (images == null) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java index 1c1baf7948..47d6d63add 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java @@ -175,7 +175,7 @@ public class ControlExample { * Loads the resources */ void initResources() { - final Class clazz = ControlExample.class; + final Class clazz = ControlExample.class; if (resourceBundle != null) { try { if (images == null) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java index af2e13c3e5..2cc544ee77 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/Tab.java @@ -11,6 +11,8 @@ package org.eclipse.swt.examples.controlexample; +import java.lang.reflect.Method; + import org.eclipse.swt.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.widgets.*; @@ -1051,7 +1053,7 @@ abstract class Tab { String parameterInfo(String methodRoot) { String typeName = null; - Class returnType = getReturnType(methodRoot); + Class returnType = getReturnType(methodRoot); boolean isArray = returnType.isArray(); if (isArray) { typeName = returnType.getComponentType().getName(); @@ -1074,7 +1076,7 @@ abstract class Tab { Widget[] widgets = getExampleWidgets(); for (int i = 0; i < widgets.length; i++) { try { - java.lang.reflect.Method method = widgets[i].getClass().getMethod(methodName, null); + Method method = widgets[i].getClass().getMethod(methodName, null); Object result = method.invoke(widgets[i], null); if (result == null) { getText.append("null"); @@ -1098,12 +1100,12 @@ abstract class Tab { } } - Class getReturnType(String methodRoot) { - Class returnType = null; + Class getReturnType(String methodRoot) { + Class returnType = null; String methodName = "get" + methodRoot; Widget[] widgets = getExampleWidgets(); try { - java.lang.reflect.Method method = widgets[0].getClass().getMethod(methodName, null); + Method method = widgets[0].getClass().getMethod(methodName, null); returnType = method.getReturnType(); } catch (Exception e) { } @@ -1113,7 +1115,7 @@ abstract class Tab { void setValue() { /* The parameter type must be the same as the get method's return type */ String methodRoot = nameCombo.getText(); - Class returnType = getReturnType(methodRoot); + Class returnType = getReturnType(methodRoot); String methodName = setMethodName(methodRoot); String value = setText.getText(); Widget[] widgets = getExampleWidgets(); diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java index 0c3d8c30b0..12efd4517d 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/FileViewer.java @@ -858,7 +858,7 @@ public class FileViewer { * If not already expanded, recursively expands the parents of the specified * directory until it is visible. */ - Vector /* of File */ path = new Vector(); + Vector path = new Vector(); // Build a stack of paths from the root of the tree while (dir != null) { path.add(dir); @@ -868,7 +868,7 @@ public class FileViewer { TreeItem[] items = tree.getItems(); TreeItem lastItem = null; for (int i = path.size() - 1; i >= 0; --i) { - final File pathElement = (File) path.elementAt(i); + final File pathElement = path.elementAt(i); // Search for a particular File in the array of tree items // No guarantee that the items are sorted in any recognizable fashion, so we'll @@ -1104,7 +1104,7 @@ public class FileViewer { progressDialog.open(); // Copy each file - Vector /* of File */ processedFiles = new Vector(); + Vector /* of File */ processedFiles = new Vector(); for (int i = 0; (i < sourceNames.length) && (! progressDialog.isCancelled()); i++){ final File source = new File(sourceNames[i]); final File dest = new File(targetFile, source.getName()); @@ -1149,7 +1149,7 @@ public class FileViewer { } if (isDragging) { // Remember exactly which files we processed - processedDropFiles = ((File[]) processedFiles.toArray(new File[processedFiles.size()])); + processedDropFiles = processedFiles.toArray(new File[processedFiles.size()]); } else { progressDialog.close(); progressDialog = null; @@ -1225,7 +1225,7 @@ public class FileViewer { * -- PORTABILITY ISSUES HERE -- */ if (System.getProperty ("os.name").indexOf ("Windows") != -1) { - Vector /* of File */ list = new Vector(); + Vector /* of File */ list = new Vector(); list.add(new File(DRIVE_A)); list.add(new File(DRIVE_B)); for (char i = 'c'; i <= 'z'; ++i) { @@ -1238,7 +1238,7 @@ public class FileViewer { } } } - File[] roots = (File[]) list.toArray(new File[list.size()]); + File[] roots = list.toArray(new File[list.size()]); sortFiles(roots); return roots; } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java index 11b601cb51..7afa68a03b 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/fileviewer/IconCache.java @@ -66,7 +66,7 @@ class IconCache { cursorWait = 1; public Cursor stockCursors[]; // Cached icons - private Hashtable iconCache; /* map Program to Image */ + private Hashtable iconCache; /* map Program to Image */ public IconCache() { } @@ -95,7 +95,7 @@ class IconCache { display.getSystemCursor(SWT.CURSOR_WAIT) }; } - iconCache = new Hashtable(); + iconCache = new Hashtable(); } /** * Frees the resources @@ -109,8 +109,8 @@ class IconCache { stockImages = null; } if (iconCache != null) { - for (Enumeration it = iconCache.elements(); it.hasMoreElements(); ) { - Image image = (Image) it.nextElement(); + for (Enumeration it = iconCache.elements(); it.hasMoreElements(); ) { + Image image = it.nextElement(); image.dispose(); } } @@ -140,7 +140,7 @@ class IconCache { * @param program the Program */ public Image getIconFromProgram(Program program) { - Image image = (Image) iconCache.get(program); + Image image = iconCache.get(program); if (image == null) { ImageData imageData = program.getImageData(); if (imageData != null) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java index 81ab1c1e9c..07cbffb884 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/AdvancedGraphics.java @@ -27,7 +27,7 @@ public class AdvancedGraphics { private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("examples_graphics"); - static Image loadImage (Device device, Class clazz, String string) { + static Image loadImage (Device device, Class clazz, String string) { InputStream stream = clazz.getResourceAsStream (string); if (stream == null) return null; Image image = null; 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 404be718cb..25259c37b1 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 @@ -36,7 +36,7 @@ public class BallTab extends AnimatedGraphicsTab { float incX, incY; // values by which to move the ball int ball_size; // size (diameter) of the ball int capacity; // number of balls in the collection - LinkedList prevx, prevy; // collection of previous x and y positions + LinkedList prevx, prevy; // collection of previous x and y positions // of ball Color[] colors; // colors used for this ball collection @@ -48,8 +48,8 @@ public class BallTab extends AnimatedGraphicsTab { this.incY = incY; this.ball_size = ball_size; this.capacity = capacity; - prevx = new LinkedList(); - prevy = new LinkedList(); + 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 2ded07c93e..da28aef167 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 @@ -118,7 +118,7 @@ public class ColorMenu { /** Adds the colors items to the menu. */ private void addColorItems(Menu menu, MenuItemListener menuListener, - ArrayList menuResources) { + ArrayList menuResources) { Display display = menu.getDisplay(); if (menu.getItemCount() != 0) { @@ -173,7 +173,7 @@ public class ColorMenu { /** Adds the pattern items to the menu. */ private void addPatternItems(Menu menu, MenuItemListener menuListener, - ArrayList menuResources) { + ArrayList menuResources) { Display display = menu.getDisplay(); if (menu.getItemCount() != 0) { @@ -242,7 +242,7 @@ public class ColorMenu { * @param resources * The list of resources of the menu */ - private Image loadImage(Display display, String name, ArrayList resources) { + private Image loadImage(Display display, String name, ArrayList resources) { Image image = GraphicsExample.loadImage(display, GraphicsExample.class, name); if (image != null) resources.add(image); return image; @@ -258,11 +258,11 @@ public class ColorMenu { Color customColor; GraphicsBackground background; // used to store information about the background ColorListener colorListener; - ArrayList resources; + ArrayList resources; public MenuItemListener(Control parent){ this.parent = parent; - resources = new ArrayList(); + resources = new ArrayList(); } /** * Method used to set the ColorListener @@ -275,7 +275,7 @@ public class ColorMenu { this.colorListener = cl; } - public ArrayList getMenuResources() { + public ArrayList getMenuResources() { return resources; } @@ -284,9 +284,9 @@ public class ColorMenu { case SWT.Dispose: for (int i = 0; i < resources.size(); i++) { - ((Resource) resources.get(i)).dispose(); + resources.get(i).dispose(); } - resources = new ArrayList(); + 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 ff8d283674..a5bd4060bc 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 @@ -29,7 +29,7 @@ public class CustomFontTab extends GraphicsTab { Combo fontFaceCb, fontStyleCb; Spinner fontPointSpinner; Button colorButton; - ArrayList fontNames; + ArrayList fontNames; int [] styleValues; String [] fontStyles; Menu menu; @@ -39,13 +39,13 @@ public CustomFontTab(GraphicsExample example) { // create list of fonts for this platform FontData [] fontData = Display.getCurrent().getFontList(null, true); - fontNames = new ArrayList(); + fontNames = new ArrayList(); for (int i=0; i < fontData.length; i++) { // remove duplicates and sort String nextName = fontData[i].getName(); if (!fontNames.contains(nextName)) { int j = 0; - while(j < fontNames.size() && nextName.compareTo((String)fontNames.get(j)) > 0) { + while(j < fontNames.size() && nextName.compareTo(fontNames.get(j)) > 0) { j++; } fontNames.add(j, nextName); @@ -91,7 +91,7 @@ public void createControlPanel(Composite parent) { new Label(comp, SWT.LEFT).setText(GraphicsExample.getResourceString("FontFace")); //$NON-NLS-1$ fontFaceCb = new Combo(comp, SWT.DROP_DOWN); for (int i=0; i < fontNames.size(); i++) { - String name = (String)fontNames.get(i); + String name = fontNames.get(i); fontFaceCb.add(name); } fontFaceCb.select(0); @@ -172,7 +172,7 @@ public void paint(GC gc, int width, int height) { if (!example.checkAdvancedGraphics()) return; Device device = gc.getDevice(); - String fontFace = (String)fontNames.get(fontFaceCb.getSelectionIndex()); + String fontFace = fontNames.get(fontFaceCb.getSelectionIndex()); int points = fontPointSpinner.getSelection(); int style = styleValues[fontStyleCb.getSelectionIndex()]; 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 807243d679..225a4e4372 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 @@ -35,7 +35,7 @@ public class GradientDialog extends Dialog { RGB rgb1, rgb2; // first and second color used in gradient int returnVal; // value to be returned by open(), set to SWT.OK // if the ok button has been pressed - ArrayList resources; + ArrayList resources; public GradientDialog(Shell parent) { this (parent, SWT.PRIMARY_MODAL); @@ -45,7 +45,7 @@ public class GradientDialog extends Dialog { super(parent, style); rgb1 = rgb2 = null; returnVal = SWT.CANCEL; - resources = new ArrayList(); + resources = new ArrayList(); } /** diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientTab.java index 33034bb3d4..c0200a68bf 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/graphics/GradientTab.java @@ -26,7 +26,7 @@ public class GradientTab extends GraphicsTab { ToolItem colorItem1, colorItem2; Menu menu1, menu2; GraphicsBackground colorGB1, colorGB2; - ArrayList resources; // resources to be disposed when the dipose() method is invoked + ArrayList resources; // resources to be disposed when the dipose() method is invoked public GradientTab(GraphicsExample example) { 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 5a61878859..24ee4016cd 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 @@ -38,8 +38,8 @@ public class GraphicsExample { ToolItem backItem, dbItem; // background, double buffer items Menu backMenu; // background menu item - ArrayList resources; // stores resources that will be disposed - ArrayList tabs_in_order; // stores GraphicsTabs in the order that they appear in the tree + ArrayList resources; // stores resources that will be disposed + ArrayList tabs_in_order; // stores GraphicsTabs in the order that they appear in the tree boolean animate = true; // whether animation should happen static boolean advanceGraphics, advanceGraphicsInit; @@ -58,7 +58,7 @@ public GraphicsExample() { public GraphicsExample(final Composite parent) { this.parent = parent; - resources = new ArrayList(); + resources = new ArrayList(); createControls(parent); setTab(tab); startAnimationTimer(); @@ -237,7 +237,7 @@ void createToolBar(final Composite parent) { int index = tabs_in_order.indexOf(tab) - 1; if (index < 0) index = tabs_in_order.size() - 1; - setTab((GraphicsTab)tabs_in_order.get(index)); + setTab(tabs_in_order.get(index)); } }); @@ -247,7 +247,7 @@ void createToolBar(final Composite parent) { next.addListener(SWT.Selection, new Listener() { public void handleEvent(Event event) { int index = (tabs_in_order.indexOf(tab) + 1)%tabs_in_order.size(); - setTab((GraphicsTab)tabs_in_order.get(index)); + setTab(tabs_in_order.get(index)); } }); @@ -369,12 +369,12 @@ static Image createImage(Device device, Color color) { void createTabList(Composite parent) { tabList = new Tree(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - Arrays.sort(tabs, new Comparator() { - public int compare(Object tab0, Object tab1) { - return ((GraphicsTab)tab0).getText().compareTo(((GraphicsTab)tab1).getText()); + Arrays.sort(tabs, new Comparator() { + public int compare(GraphicsTab tab0, GraphicsTab tab1) { + return tab0.getText().compareTo(tab1.getText()); } }); - HashSet set = new HashSet(); + HashSet set = new HashSet(); for (int i = 0; i < tabs.length; i++) { GraphicsTab tab = tabs[i]; set.add(tab.getCategory()); @@ -387,7 +387,7 @@ void createTabList(Composite parent) { TreeItem item = new TreeItem(tabList, SWT.NONE); item.setText(text); } - tabs_in_order = new ArrayList(); + tabs_in_order = new ArrayList(); TreeItem[] items = tabList.getItems(); for (int i = 0; i < items.length; i++) { TreeItem item = items[i]; @@ -475,7 +475,7 @@ public void dispose() { if (resources != null) { for (int i = 0; i < resources.size(); i++) { if (resources.get(i) instanceof Resource) { - ((Resource)resources.get(i)).dispose(); + resources.get(i).dispose(); } } } @@ -519,7 +519,7 @@ static String getResourceString(String key) { } } -static Image loadImage (Device device, Class clazz, String string) { +static Image loadImage (Device device, Class clazz, String string) { InputStream stream = clazz.getResourceAsStream (string); if (stream == null) return null; Image image = null; 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 674e145f4e..816d7304b2 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 @@ -25,7 +25,7 @@ public class MazeTab extends AnimatedGraphicsTab { int nextIndex, nextIndex2, nextIndex3; int xcoord, ycoord, xcoord2, ycoord2, xcoord3, ycoord3; - ArrayList nextCoord, nextCoord2, nextCoord3; + ArrayList nextCoord, nextCoord2, nextCoord3; boolean isDone, isDone2, isDone3; Image image; @@ -37,7 +37,7 @@ public MazeTab(GraphicsExample example) { super(example); // correct path - nextCoord = new ArrayList(); + 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)); @@ -57,11 +57,11 @@ public MazeTab(GraphicsExample example) { nextCoord.addAll(moveDown(20, 445, 20, 495, 10)); nextIndex = 0; - xcoord = ((Integer)nextCoord.get(nextIndex)).intValue(); - ycoord = ((Integer)nextCoord.get(nextIndex+1)).intValue(); + xcoord = nextCoord.get(nextIndex).intValue(); + ycoord = nextCoord.get(nextIndex+1).intValue(); // wrong path 1 - nextCoord2 = new ArrayList(); + 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)); @@ -70,11 +70,11 @@ public MazeTab(GraphicsExample example) { nextCoord2.addAll(moveLeft(515, 480, 70, 480, 10)); nextIndex2 = 0; - xcoord2 = ((Integer)nextCoord2.get(nextIndex2)).intValue(); - ycoord2 = ((Integer)nextCoord2.get(nextIndex2+1)).intValue(); + xcoord2 = nextCoord2.get(nextIndex2).intValue(); + ycoord2 = nextCoord2.get(nextIndex2+1).intValue(); // wrong path 2 - nextCoord3 = new ArrayList(); + 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)); @@ -90,8 +90,8 @@ public MazeTab(GraphicsExample example) { nextCoord3.addAll(moveDown(70, 150, 70, 320, 10)); nextIndex3 = 0; - xcoord3 = ((Integer)nextCoord3.get(nextIndex3)).intValue(); - ycoord3 = ((Integer)nextCoord3.get(nextIndex3+1)).intValue(); + xcoord3 = nextCoord3.get(nextIndex3).intValue(); + ycoord3 = nextCoord3.get(nextIndex3+1).intValue(); isDone = isDone2 = isDone3 = false; } @@ -141,8 +141,8 @@ public void next(int width, int height) { if (nextIndex+2 < nextCoord.size()) { nextIndex = (nextIndex+2)%nextCoord.size(); - xcoord = ((Integer)nextCoord.get(nextIndex)).intValue(); - ycoord = ((Integer)nextCoord.get(nextIndex+1)).intValue(); + xcoord = nextCoord.get(nextIndex).intValue(); + ycoord = nextCoord.get(nextIndex+1).intValue(); } else { // stop animation setAnimation(false); @@ -151,16 +151,16 @@ public void next(int width, int height) { if (nextIndex2+2 < nextCoord2.size()) { nextIndex2 = (nextIndex2+2)%nextCoord2.size(); - xcoord2 = ((Integer)nextCoord2.get(nextIndex2)).intValue(); - ycoord2 = ((Integer)nextCoord2.get(nextIndex2+1)).intValue(); + xcoord2 = nextCoord2.get(nextIndex2).intValue(); + ycoord2 = nextCoord2.get(nextIndex2+1).intValue(); } else { isDone2 = true; } if (nextIndex3+2 < nextCoord3.size()) { nextIndex3 = (nextIndex3+2)%nextCoord3.size(); - xcoord3 = ((Integer)nextCoord3.get(nextIndex3)).intValue(); - ycoord3 = ((Integer)nextCoord3.get(nextIndex3+1)).intValue(); + xcoord3 = nextCoord3.get(nextIndex3).intValue(); + ycoord3 = nextCoord3.get(nextIndex3+1).intValue(); } else { isDone3 = true; } @@ -224,8 +224,8 @@ public void paint(GC gc, int width, int height) { * @param stepsize * The number of pixels that separate each coordinate */ -private ArrayList moveLeft(int x1, int y1, int x2, int y2, int stepsize) { - ArrayList coords = new ArrayList(); +private ArrayList moveLeft(int x1, int y1, int x2, int y2, int stepsize) { + ArrayList coords = new ArrayList(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(x1 - stepsize > x2) { @@ -253,8 +253,8 @@ private ArrayList moveLeft(int x1, int y1, int x2, int y2, int stepsize) { * @param stepsize * The number of pixels that separate each coordinate */ -private ArrayList moveRight(int x1, int y1, int x2, int y2, int stepsize) { - ArrayList coords = new ArrayList(); +private ArrayList moveRight(int x1, int y1, int x2, int y2, int stepsize) { + ArrayList coords = new ArrayList(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(x1 + stepsize < x2) { @@ -282,8 +282,8 @@ private ArrayList moveRight(int x1, int y1, int x2, int y2, int stepsize) { * @param stepsize * The number of pixels that separate each coordinate */ -private ArrayList moveUp(int x1, int y1, int x2, int y2, int stepsize) { - ArrayList coords = new ArrayList(); +private ArrayList moveUp(int x1, int y1, int x2, int y2, int stepsize) { + ArrayList coords = new ArrayList(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(y1 - stepsize > y2) { @@ -311,8 +311,8 @@ private ArrayList moveUp(int x1, int y1, int x2, int y2, int stepsize) { * @param stepsize * The number of pixels that separate each coordinate */ -private ArrayList moveDown(int x1, int y1, int x2, int y2, int stepsize) { - ArrayList coords = new ArrayList(); +private ArrayList moveDown(int x1, int y1, int x2, int y2, int stepsize) { + ArrayList coords = new ArrayList(); coords.add(new Integer(x1)); coords.add(new Integer(y1)); while(y1 + stepsize < y2) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java index ac17858a81..f19c165c05 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/hoverhelp/HoverHelp.java @@ -56,7 +56,7 @@ public class HoverHelp { */ public Shell open(Display display) { // Load the images - Class clazz = HoverHelp.class; + Class clazz = HoverHelp.class; try { if (images == null) { images = new Image[imageLocations.length]; diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java index 6973182a54..3032a0883c 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java @@ -18,6 +18,7 @@ import org.eclipse.swt.layout.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.printing.*; import org.eclipse.swt.custom.*; + import java.util.*; import java.net.*; import java.io.*; @@ -63,7 +64,7 @@ public class ImageAnalyzer { int imageDataIndex; // the index of the current image data ImageData imageData; // the currently-displayed image data Image image; // the currently-displayed image - Vector incrementalEvents; // incremental image events + Vector incrementalEvents; // incremental image events long loadTime = 0; // the time it took to load the current image static final int INDEX_DIGITS = 4; @@ -1029,7 +1030,7 @@ public class ImageAnalyzer { * as they are loaded. */ void incrementalThreadStart() { - incrementalEvents = new Vector(); + incrementalEvents = new Vector(); incrementalThread = new Thread("Incremental") { public void run() { // Draw the first ImageData increment. @@ -1038,7 +1039,7 @@ public class ImageAnalyzer { synchronized (ImageAnalyzer.this) { if (incrementalEvents != null) { if (incrementalEvents.size() > 0) { - ImageLoaderEvent event = (ImageLoaderEvent) incrementalEvents.remove(0); + ImageLoaderEvent event = incrementalEvents.remove(0); if (image != null) image.dispose(); image = new Image(display, event.imageData); imageData = event.imageData; diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java index a48e850977..094ca64831 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaLineStyler.java @@ -15,6 +15,7 @@ import org.eclipse.swt.*; import org.eclipse.swt.custom.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.widgets.*; + import java.util.*; import java.io.*; @@ -22,7 +23,7 @@ class JavaLineStyler implements LineStyleListener { JavaScanner scanner = new JavaScanner(); int[] tokenColors; Color[] colors; - Vector blockComments = new Vector(); + Vector blockComments = new Vector(); public static final int EOF= -1; public static final int EOL= 10; @@ -51,7 +52,7 @@ Color getColor(int type) { boolean inBlockComment(int start, int end) { for (int i=0; i= start) && (offsets[0] <= end)) return true; // end of comment in the line @@ -92,7 +93,7 @@ void disposeColors() { * LineStyleEvent.background line background color (output) */ public void lineGetStyle(LineStyleEvent event) { - Vector styles = new Vector(); + Vector styles = new Vector(); int token; StyleRange lastStyle; // If the line is part of a block comment, create one style for the entire line. @@ -122,7 +123,7 @@ public void lineGetStyle(LineStyleEvent event) { styles.addElement(style); } else { // Merge similar styles. Doing so will improve performance. - lastStyle = (StyleRange)styles.lastElement(); + lastStyle = styles.lastElement(); if (lastStyle.similarTo(style) && (lastStyle.start + lastStyle.length == style.start)) { lastStyle.length += style.length; } else { @@ -130,9 +131,9 @@ public void lineGetStyle(LineStyleEvent event) { } } } - } else if ((!styles.isEmpty()) && ((lastStyle=(StyleRange)styles.lastElement()).fontStyle == SWT.BOLD)) { + } else if ((!styles.isEmpty()) && ((lastStyle=styles.lastElement()).fontStyle == SWT.BOLD)) { int start = scanner.getStartOffset() + event.lineOffset; - lastStyle = (StyleRange)styles.lastElement(); + lastStyle = styles.lastElement(); // A font style of SWT.BOLD implies that the last style // represents a java keyword. if (lastStyle.start + lastStyle.length == start) { @@ -148,7 +149,7 @@ public void lineGetStyle(LineStyleEvent event) { styles.copyInto(event.styles); } public void parseBlockComments(String text) { - blockComments = new Vector(); + blockComments = new Vector(); StringReader buffer = new StringReader(text); int ch; boolean blkComment = false; @@ -209,7 +210,7 @@ public void parseBlockComments(String text) { */ public class JavaScanner { - protected Hashtable fgKeys= null; + protected Hashtable fgKeys= null; protected StringBuffer fBuffer= new StringBuffer(); protected String fDoc; protected int fPos; @@ -250,7 +251,7 @@ public class JavaScanner { * Initialize the lookup table. */ void initialize() { - fgKeys= new Hashtable(); + fgKeys= new Hashtable(); Integer k= new Integer(KEY); for (int i= 0; i < fgKeywords.length; i++) fgKeys.put(fgKeywords[i], k); @@ -338,7 +339,7 @@ public class JavaScanner { c= read(); } while(Character.isJavaIdentifierPart((char)c)); unread(c); - Integer i= (Integer) fgKeys.get(fBuffer.toString()); + Integer i= fgKeys.get(fBuffer.toString()); if (i != null) return i.intValue(); return WORD; diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java index c31f57b8e3..8f34be3b2c 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/javaviewer/JavaViewer.java @@ -135,7 +135,7 @@ void open(String name) { File file = new File(name); if (!file.exists()) { - String message = MessageFormat.format(resources.getString("Err_file_no_exist"), new String[] {file.getName()}); + String message = MessageFormat.format(resources.getString("Err_file_no_exist"), file.getName()); displayError(message); return; } @@ -155,13 +155,13 @@ void open(String name) { } catch (IOException e) { // Err_file_io - String message = MessageFormat.format(resources.getString("Err_file_io"), new String[] {file.getName()}); + String message = MessageFormat.format(resources.getString("Err_file_io"), file.getName()); displayError(message); return; } } catch (FileNotFoundException e) { - String message = MessageFormat.format(resources.getString("Err_not_found"), new String[] {file.getName()}); + String message = MessageFormat.format(resources.getString("Err_not_found"), file.getName()); displayError(message); return; } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java index d2d848129b..c05fd593aa 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/Tab.java @@ -59,7 +59,7 @@ abstract class Tab { "Group", "Label", "Link", "List", "ProgressBar", "Scale", "Slider", "StyledText", "Table", "Text", "ToolBar", "Tree"}; TableItem newItem, lastSelected; - Vector data = new Vector (); + Vector data = new Vector (); /* Controlling instance */ final LayoutExample instance; diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java index 19a10a4597..ba88a3ad78 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/PaintExample.java @@ -471,7 +471,7 @@ public class PaintExample { * Loads the image resources. */ public void initResources() { - final Class clazz = PaintExample.class; + final Class clazz = PaintExample.class; if (resourceBundle != null) { try { for (int i = 0; i < tools.length; ++i) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java index 4ffa99db60..4d9d8d424b 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/paint/SegmentedPaintSession.java @@ -24,7 +24,7 @@ public abstract class SegmentedPaintSession extends BasicPaintSession { /** * The set of control points making up the segmented selection */ - private Vector /* of Point */ controlPoints = new Vector(); + private Vector controlPoints = new Vector(); /** * The previous figure (so that we can abort with right-button) @@ -92,7 +92,7 @@ public abstract class SegmentedPaintSession extends BasicPaintSession { previousFigure = currentFigure; if (controlPoints.size() > 0) { - final Point lastPoint = (Point) controlPoints.elementAt(controlPoints.size() - 1); + final Point lastPoint = controlPoints.elementAt(controlPoints.size() - 1); if (lastPoint.x == event.x || lastPoint.y == event.y) return; // spurious event } controlPoints.add(new Point(event.x, event.y)); @@ -108,7 +108,7 @@ public abstract class SegmentedPaintSession extends BasicPaintSession { if (controlPoints.size() >= 2) { getPaintSurface().clearRubberbandSelection(); previousFigure = createFigure( - (Point[]) controlPoints.toArray(new Point[controlPoints.size()]), + controlPoints.toArray(new Point[controlPoints.size()]), controlPoints.size(), true); } resetSession(); @@ -137,10 +137,10 @@ public abstract class SegmentedPaintSession extends BasicPaintSession { ps.setStatusCoord(ps.getCurrentPosition()); return; // spurious event } - ps.setStatusCoordRange((Point) controlPoints.elementAt(controlPoints.size() - 1), + ps.setStatusCoordRange(controlPoints.elementAt(controlPoints.size() - 1), ps.getCurrentPosition()); ps.clearRubberbandSelection(); - Point[] points = (Point[]) controlPoints.toArray(new Point[controlPoints.size() + 1]); + Point[] points = controlPoints.toArray(new Point[controlPoints.size() + 1]); points[controlPoints.size()] = ps.getCurrentPosition(); currentFigure = createFigure(points, points.length, false); ps.addRubberbandSelection(currentFigure); -- cgit v1.2.3