From 0efaf9c5835bf9c49ddcbd3cccb1af57598b4a32 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Fri, 4 Sep 2015 16:43:21 +0200 Subject: [PATCH] Cleanup: Fix obvious compiler warnings in tm.terminal.control Change-Id: I26c0c0f049e7617d8ba58701af2efd54aa2d0768 Signed-off-by: Martin Oberhuber --- .../terminal/connector/TerminalConnector.java | 1 - .../internal/terminal/model/TerminalTextData.java | 8 ++++---- .../terminal/model/TerminalTextDataSnapshot.java | 8 ++++---- .../terminal/model/TerminalTextDataStore.java | 6 +++--- .../api/TerminalConnectorExtension.java | 4 ++-- .../api/provider/TerminalConnectorImpl.java | 1 - .../textcanvas/AbstractTextCanvasModel.java | 14 +++++++------- .../tm/internal/terminal/textcanvas/StyleMap.java | 15 +++++++-------- .../src/org/eclipse/tm/terminal/model/Style.java | 4 ++-- .../org/eclipse/tm/terminal/model/StyleColor.java | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.tm.terminal.test/pom.xml | 2 +- .../connector/TerminalConnectorFactoryTest.java | 1 - .../terminal/connector/TerminalConnectorTest.java | 1 - 14 files changed, 33 insertions(+), 38 deletions(-) diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java index 36b000aef44..cfbdabe8c88 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java @@ -18,7 +18,6 @@ import java.io.OutputStream; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Platform; import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java index dd57d9da98c..a361d0adef5 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java @@ -187,20 +187,20 @@ public class TerminalTextData implements ITerminalTextData { */ protected void removeSnapshot(TerminalTextDataSnapshot snapshot) { // poor mans approach to modify the array - List list=new ArrayList(); + List list=new ArrayList(); list.addAll(Arrays.asList(fSnapshots)); list.remove(snapshot); - fSnapshots=(TerminalTextDataSnapshot[]) list.toArray(new TerminalTextDataSnapshot[list.size()]); + fSnapshots=list.toArray(new TerminalTextDataSnapshot[list.size()]); } public ITerminalTextDataSnapshot makeSnapshot() { // poor mans approach to modify the array TerminalTextDataSnapshot snapshot=new TerminalTextDataSnapshot(this); snapshot.markDimensionsChanged(); - List list=new ArrayList(); + List list=new ArrayList(); list.addAll(Arrays.asList(fSnapshots)); list.add(snapshot); - fSnapshots=(TerminalTextDataSnapshot[]) list.toArray(new TerminalTextDataSnapshot[list.size()]); + fSnapshots=list.toArray(new TerminalTextDataSnapshot[list.size()]); return snapshot; } public void addLine() { diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java index aa0e2d79db6..9d9924b533b 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java @@ -241,17 +241,17 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot { } synchronized public void addListener(SnapshotOutOfDateListener listener) { - List list=new ArrayList(); + List list=new ArrayList(); list.addAll(Arrays.asList(fListener)); list.add(listener); - fListener=(SnapshotOutOfDateListener[]) list.toArray(new SnapshotOutOfDateListener[list.size()]); + fListener=list.toArray(new SnapshotOutOfDateListener[list.size()]); } synchronized public void removeListener(SnapshotOutOfDateListener listener) { - List list=new ArrayList(); + List list=new ArrayList(); list.addAll(Arrays.asList(fListener)); list.remove(listener); - fListener=(SnapshotOutOfDateListener[]) list.toArray(new SnapshotOutOfDateListener[list.size()]); + fListener=list.toArray(new SnapshotOutOfDateListener[list.size()]); } public String toString() { return fSnapshot.toString(); diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java index b5927ff26bb..9817087942b 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java @@ -98,7 +98,7 @@ public class TerminalTextDataStore implements ITerminalTextData { int oldSize = Array.getLength(origArray); if(oldSize==newSize) return origArray; - Class elementType = origArray.getClass().getComponentType(); + Class elementType = origArray.getClass().getComponentType(); Object newArray = Array.newInstance(elementType, newSize); int preserveLength = Math.min(oldSize, newSize); if (preserveLength > 0) @@ -130,7 +130,7 @@ public class TerminalTextDataStore implements ITerminalTextData { // and create the line segments Style style=styles[column]; - List segments=new ArrayList(); + List segments=new ArrayList(); for (int i = column; i < n; i++) { if(styles[i]!=style) { segments.add(new LineSegment(col,new String(chars,col,i-col),style)); @@ -141,7 +141,7 @@ public class TerminalTextDataStore implements ITerminalTextData { if(col < n) { segments.add(new LineSegment(col,new String(chars,col,n-col),style)); } - return (LineSegment[]) segments.toArray(new LineSegment[segments.size()]); + return segments.toArray(new LineSegment[segments.size()]); } /* (non-Javadoc) * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getChar(int, int) diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java index 198a13cca83..fe494bc0da7 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java @@ -88,11 +88,11 @@ public class TerminalConnectorExtension { */ public static ITerminalConnector[] makeTerminalConnectors() { IConfigurationElement[] config = RegistryFactory.getRegistry().getConfigurationElementsFor("org.eclipse.tm.terminal.control.connectors"); //$NON-NLS-1$ - List result=new ArrayList(); + List result=new ArrayList(); for (int i = 0; i < config.length; i++) { result.add(makeConnector(config[i])); } - return (ITerminalConnector[]) result.toArray(new ITerminalConnector[result.size()]); + return result.toArray(new ITerminalConnector[result.size()]); } } diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java index a8c8dae783b..a358335508e 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java @@ -13,7 +13,6 @@ package org.eclipse.tm.internal.terminal.provisional.api.provider; import java.io.OutputStream; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.Logger; diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java index 5d03a25db78..799101486e8 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java @@ -21,7 +21,7 @@ import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; abstract public class AbstractTextCanvasModel implements ITextCanvasModel { - protected List fListeners = new ArrayList(); + protected List fListeners = new ArrayList(); private int fCursorLine; private int fCursorColumn; private boolean fShowCursor; @@ -56,21 +56,21 @@ abstract public class AbstractTextCanvasModel implements ITextCanvasModel { } protected void fireCellRangeChanged(int x, int y, int width, int height) { - for (Iterator iter = fListeners.iterator(); iter.hasNext();) { - ITextCanvasModelListener listener = (ITextCanvasModelListener) iter.next(); + for (Iterator iter = fListeners.iterator(); iter.hasNext();) { + ITextCanvasModelListener listener = iter.next(); listener.rangeChanged(x, y, width, height); } } protected void fireDimensionsChanged( int width,int height) { - for (Iterator iter = fListeners.iterator(); iter.hasNext();) { - ITextCanvasModelListener listener = (ITextCanvasModelListener) iter.next(); + for (Iterator iter = fListeners.iterator(); iter.hasNext();) { + ITextCanvasModelListener listener = iter.next(); listener.dimensionsChanged(width,height); } } protected void fireTerminalDataChanged() { - for (Iterator iter = fListeners.iterator(); iter.hasNext();) { - ITextCanvasModelListener listener = (ITextCanvasModelListener) iter.next(); + for (Iterator iter = fListeners.iterator(); iter.hasNext();) { + ITextCanvasModelListener listener = iter.next(); listener.terminalDataChanged(); } diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java index 818c8fd717b..a4db1183e76 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java @@ -45,10 +45,9 @@ public class StyleMap { private static final String PREFIX = "org.eclipse.tm.internal."; //$NON-NLS-1$ String fFontName=ITerminalConstants.FONT_DEFINITION; - Map fColorMapForeground=new HashMap(); - Map fColorMapBackground=new HashMap(); - Map fColorMapIntense=new HashMap(); - Map fFontMap=new HashMap(); + Map fColorMapForeground=new HashMap(); + Map fColorMapBackground=new HashMap(); + Map fColorMapIntense=new HashMap(); private Point fCharSize; private final Style fDefaultStyle; private boolean fInvertColors; @@ -121,7 +120,7 @@ public class StyleMap { setColor(fColorMapIntense, GRAY, 255, 255, 255); } - private void setColor(Map colorMap, String name, int r, int g, int b) { + private void setColor(Map colorMap, String name, int r, int g, int b) { String colorName=PREFIX+r+"-"+g+"-"+b; //$NON-NLS-1$//$NON-NLS-2$ Color color=JFaceResources.getColorRegistry().get(colorName); if(color==null) { @@ -134,7 +133,7 @@ public class StyleMap { public Color getForegrondColor(Style style) { style = defaultIfNull(style); - Map map = style.isBold() ? fColorMapIntense : fColorMapForeground; + Map map = style.isBold() ? fColorMapIntense : fColorMapForeground; //Map map = fColorMapForeground; if(style.isReverse()) return getColor(map ,style.getBackground()); @@ -148,8 +147,8 @@ public class StyleMap { else return getColor(fColorMapBackground,style.getBackground()); } - Color getColor(Map map,StyleColor color) { - Color c=(Color) map.get(color); + Color getColor(Map map,StyleColor color) { + Color c=map.get(color); if(c==null) { c=Display.getCurrent().getSystemColor(SWT.COLOR_GRAY); } diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/Style.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/Style.java index 0a6605d2876..001ad6896f1 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/Style.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/Style.java @@ -28,7 +28,7 @@ public class Style { private final boolean fBlink; private final boolean fUnderline; private final boolean fReverse; - private final static Map fgStyles=new HashMap(); + private final static Map fgStyles=new HashMap(); private Style(StyleColor forground, StyleColor background, boolean bold, boolean blink, boolean underline, boolean reverse) { fForground = forground; fBackground = background; @@ -41,7 +41,7 @@ public class Style { Style style = new Style(forground,background, bold, blink,underline,reverse); Style cached; synchronized (fgStyles) { - cached=(Style) fgStyles.get(style); + cached=fgStyles.get(style); if(cached==null) { cached=style; fgStyles.put(cached, cached); diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/StyleColor.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/StyleColor.java index 0fbe6982eb8..98b19ad02ad 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/StyleColor.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/StyleColor.java @@ -19,7 +19,7 @@ import java.util.Map; * Threadsafe. */ public class StyleColor { - private final static Map fgStyleColors=new HashMap(); + private final static Map fgStyleColors=new HashMap(); final String fName; /** @@ -30,7 +30,7 @@ public class StyleColor { public static StyleColor getStyleColor(String name) { StyleColor result; synchronized (fgStyleColors) { - result=(StyleColor) fgStyleColors.get(name); + result=fgStyleColors.get(name); if(result==null) { result=new StyleColor(name); fgStyleColors.put(name, result); diff --git a/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF index a52b1f97166..4395479d55f 100644 --- a/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 4.0.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.junit, diff --git a/plugins/org.eclipse.tm.terminal.test/pom.xml b/plugins/org.eclipse.tm.terminal.test/pom.xml index 77b36ebc9dd..5b0b55862f7 100644 --- a/plugins/org.eclipse.tm.terminal.test/pom.xml +++ b/plugins/org.eclipse.tm.terminal.test/pom.xml @@ -11,7 +11,7 @@ ../../admin/pom-build.xml - 4.0.0-SNAPSHOT + 4.0.100-SNAPSHOT org.eclipse.tm.terminal.test eclipse-test-plugin diff --git a/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java b/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java index 4e3119ed450..3a1a9ea5571 100644 --- a/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java +++ b/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java @@ -21,7 +21,6 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.Platform; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; diff --git a/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java b/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java index ac85e4c1974..72f0eec66a8 100644 --- a/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java +++ b/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java @@ -21,7 +21,6 @@ import junit.framework.TestCase; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.connector.TerminalConnector.Factory; -import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage; import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;