mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Cleanup: Fix obvious compiler warnings in tm.terminal.control

Browse source 
Change-Id: I26c0c0f049e7617d8ba58701af2efd54aa2d0768
Signed-off-by: Martin Oberhuber <martin.oberhuber@windriver.com>
This commit is contained in:
Martin Oberhuber 2015-09-04 16:43:21 +02:00
parent 3d2cdcc986
commit 0efaf9c583
14 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/connector/TerminalConnector.java
View file

@ -18,7 +18,6 @@ import java.io.OutputStream;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages; 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.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;

8
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java
View file

@ -187,20 +187,20 @@ public class TerminalTextData implements ITerminalTextData {
*/ */
protected void removeSnapshot(TerminalTextDataSnapshot snapshot) { protected void removeSnapshot(TerminalTextDataSnapshot snapshot) {
// poor mans approach to modify the array // poor mans approach to modify the array
List list=new ArrayList(); List<TerminalTextDataSnapshot> list=new ArrayList<TerminalTextDataSnapshot>();
list.addAll(Arrays.asList(fSnapshots)); list.addAll(Arrays.asList(fSnapshots));
list.remove(snapshot); list.remove(snapshot);
fSnapshots=(TerminalTextDataSnapshot[]) list.toArray(new TerminalTextDataSnapshot[list.size()]); fSnapshots=list.toArray(new TerminalTextDataSnapshot[list.size()]);
} }
public ITerminalTextDataSnapshot makeSnapshot() { public ITerminalTextDataSnapshot makeSnapshot() {
// poor mans approach to modify the array // poor mans approach to modify the array
TerminalTextDataSnapshot snapshot=new TerminalTextDataSnapshot(this); TerminalTextDataSnapshot snapshot=new TerminalTextDataSnapshot(this);
snapshot.markDimensionsChanged(); snapshot.markDimensionsChanged();
List list=new ArrayList(); List<TerminalTextDataSnapshot> list=new ArrayList<TerminalTextDataSnapshot>();
list.addAll(Arrays.asList(fSnapshots)); list.addAll(Arrays.asList(fSnapshots));
list.add(snapshot); list.add(snapshot);
fSnapshots=(TerminalTextDataSnapshot[]) list.toArray(new TerminalTextDataSnapshot[list.size()]); fSnapshots=list.toArray(new TerminalTextDataSnapshot[list.size()]);
return snapshot; return snapshot;
} }
public void addLine() { public void addLine() {

8
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
View file

@ -241,17 +241,17 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot {
} }
synchronized public void addListener(SnapshotOutOfDateListener listener) { synchronized public void addListener(SnapshotOutOfDateListener listener) {
List list=new ArrayList(); List<SnapshotOutOfDateListener> list=new ArrayList<SnapshotOutOfDateListener>();
list.addAll(Arrays.asList(fListener)); list.addAll(Arrays.asList(fListener));
list.add(listener); list.add(listener);
fListener=(SnapshotOutOfDateListener[]) list.toArray(new SnapshotOutOfDateListener[list.size()]); fListener=list.toArray(new SnapshotOutOfDateListener[list.size()]);
} }
synchronized public void removeListener(SnapshotOutOfDateListener listener) { synchronized public void removeListener(SnapshotOutOfDateListener listener) {
List list=new ArrayList(); List<SnapshotOutOfDateListener> list=new ArrayList<SnapshotOutOfDateListener>();
list.addAll(Arrays.asList(fListener)); list.addAll(Arrays.asList(fListener));
list.remove(listener); list.remove(listener);
fListener=(SnapshotOutOfDateListener[]) list.toArray(new SnapshotOutOfDateListener[list.size()]); fListener=list.toArray(new SnapshotOutOfDateListener[list.size()]);
} }
public String toString() { public String toString() {
return fSnapshot.toString(); return fSnapshot.toString();

6
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
View file

@ -98,7 +98,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
int oldSize = Array.getLength(origArray); int oldSize = Array.getLength(origArray);
if(oldSize==newSize) if(oldSize==newSize)
return origArray; return origArray;
Class elementType = origArray.getClass().getComponentType(); Class<?> elementType = origArray.getClass().getComponentType();
Object newArray = Array.newInstance(elementType, newSize); Object newArray = Array.newInstance(elementType, newSize);
int preserveLength = Math.min(oldSize, newSize); int preserveLength = Math.min(oldSize, newSize);
if (preserveLength > 0) if (preserveLength > 0)
@ -130,7 +130,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
// and create the line segments // and create the line segments
Style style=styles[column]; Style style=styles[column];
List segments=new ArrayList(); List<LineSegment> segments=new ArrayList<LineSegment>();
for (int i = column; i < n; i++) { for (int i = column; i < n; i++) {
if(styles[i]!=style) { if(styles[i]!=style) {
segments.add(new LineSegment(col,new String(chars,col,i-col),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) { if(col < n) {
segments.add(new LineSegment(col,new String(chars,col,n-col),style)); 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) /* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getChar(int, int) * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getChar(int, int)

4
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
View file

@ -88,11 +88,11 @@ public class TerminalConnectorExtension {
*/ */
public static ITerminalConnector[] makeTerminalConnectors() { public static ITerminalConnector[] makeTerminalConnectors() {
IConfigurationElement[] config = RegistryFactory.getRegistry().getConfigurationElementsFor("org.eclipse.tm.terminal.control.connectors"); //$NON-NLS-1$ IConfigurationElement[] config = RegistryFactory.getRegistry().getConfigurationElementsFor("org.eclipse.tm.terminal.control.connectors"); //$NON-NLS-1$
List result=new ArrayList(); List<ITerminalConnector> result=new ArrayList<ITerminalConnector>();
for (int i = 0; i < config.length; i++) { for (int i = 0; i < config.length; i++) {
result.add(makeConnector(config[i])); result.add(makeConnector(config[i]));
} }
return (ITerminalConnector[]) result.toArray(new ITerminalConnector[result.size()]); return result.toArray(new ITerminalConnector[result.size()]);
} }
} }

1
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/provider/TerminalConnectorImpl.java
View file

@ -13,7 +13,6 @@ package org.eclipse.tm.internal.terminal.provisional.api.provider;
import java.io.OutputStream; 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.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
import org.eclipse.tm.internal.terminal.provisional.api.Logger; import org.eclipse.tm.internal.terminal.provisional.api.Logger;

14
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
View file

@ -21,7 +21,7 @@ import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly;
import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot; import org.eclipse.tm.terminal.model.ITerminalTextDataSnapshot;
abstract public class AbstractTextCanvasModel implements ITextCanvasModel { abstract public class AbstractTextCanvasModel implements ITextCanvasModel {
protected List fListeners = new ArrayList(); protected List<ITextCanvasModelListener> fListeners = new ArrayList<ITextCanvasModelListener>();
private int fCursorLine; private int fCursorLine;
private int fCursorColumn; private int fCursorColumn;
private boolean fShowCursor; private boolean fShowCursor;
@ -56,21 +56,21 @@ abstract public class AbstractTextCanvasModel implements ITextCanvasModel {
} }
protected void fireCellRangeChanged(int x, int y, int width, int height) { protected void fireCellRangeChanged(int x, int y, int width, int height) {
for (Iterator iter = fListeners.iterator(); iter.hasNext();) { for (Iterator<ITextCanvasModelListener> iter = fListeners.iterator(); iter.hasNext();) {
ITextCanvasModelListener listener = (ITextCanvasModelListener) iter.next(); ITextCanvasModelListener listener = iter.next();
listener.rangeChanged(x, y, width, height); listener.rangeChanged(x, y, width, height);
} }
} }
protected void fireDimensionsChanged( int width,int height) { protected void fireDimensionsChanged( int width,int height) {
for (Iterator iter = fListeners.iterator(); iter.hasNext();) { for (Iterator<ITextCanvasModelListener> iter = fListeners.iterator(); iter.hasNext();) {
ITextCanvasModelListener listener = (ITextCanvasModelListener) iter.next(); ITextCanvasModelListener listener = iter.next();
listener.dimensionsChanged(width,height); listener.dimensionsChanged(width,height);
} }
} }
protected void fireTerminalDataChanged() { protected void fireTerminalDataChanged() {
for (Iterator iter = fListeners.iterator(); iter.hasNext();) { for (Iterator<ITextCanvasModelListener> iter = fListeners.iterator(); iter.hasNext();) {
ITextCanvasModelListener listener = (ITextCanvasModelListener) iter.next(); ITextCanvasModelListener listener = iter.next();
listener.terminalDataChanged(); listener.terminalDataChanged();
} }

15
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
View file

@ -45,10 +45,9 @@ public class StyleMap {
private static final String PREFIX = "org.eclipse.tm.internal."; //$NON-NLS-1$ private static final String PREFIX = "org.eclipse.tm.internal."; //$NON-NLS-1$
String fFontName=ITerminalConstants.FONT_DEFINITION; String fFontName=ITerminalConstants.FONT_DEFINITION;
Map fColorMapForeground=new HashMap(); Map<StyleColor, Color> fColorMapForeground=new HashMap<StyleColor, Color>();
Map fColorMapBackground=new HashMap(); Map<StyleColor, Color> fColorMapBackground=new HashMap<StyleColor, Color>();
Map fColorMapIntense=new HashMap(); Map<StyleColor, Color> fColorMapIntense=new HashMap<StyleColor, Color>();
Map fFontMap=new HashMap();
private Point fCharSize; private Point fCharSize;
private final Style fDefaultStyle; private final Style fDefaultStyle;
private boolean fInvertColors; private boolean fInvertColors;
@ -121,7 +120,7 @@ public class StyleMap {
setColor(fColorMapIntense, GRAY, 255, 255, 255); setColor(fColorMapIntense, GRAY, 255, 255, 255);
} }
private void setColor(Map colorMap, String name, int r, int g, int b) { private void setColor(Map<StyleColor, Color> colorMap, String name, int r, int g, int b) {
String colorName=PREFIX+r+"-"+g+"-"+b; //$NON-NLS-1$//$NON-NLS-2$ String colorName=PREFIX+r+"-"+g+"-"+b; //$NON-NLS-1$//$NON-NLS-2$
Color color=JFaceResources.getColorRegistry().get(colorName); Color color=JFaceResources.getColorRegistry().get(colorName);
if(color==null) { if(color==null) {
@ -134,7 +133,7 @@ public class StyleMap {
public Color getForegrondColor(Style style) { public Color getForegrondColor(Style style) {
style = defaultIfNull(style); style = defaultIfNull(style);
Map map = style.isBold() ? fColorMapIntense : fColorMapForeground; Map<StyleColor, Color> map = style.isBold() ? fColorMapIntense : fColorMapForeground;
//Map map = fColorMapForeground; //Map map = fColorMapForeground;
if(style.isReverse()) if(style.isReverse())
return getColor(map ,style.getBackground()); return getColor(map ,style.getBackground());
@ -148,8 +147,8 @@ public class StyleMap {
else else
return getColor(fColorMapBackground,style.getBackground()); return getColor(fColorMapBackground,style.getBackground());
} }
Color getColor(Map map,StyleColor color) { Color getColor(Map<StyleColor, Color> map,StyleColor color) {
Color c=(Color) map.get(color); Color c=map.get(color);
if(c==null) { if(c==null) {
c=Display.getCurrent().getSystemColor(SWT.COLOR_GRAY); c=Display.getCurrent().getSystemColor(SWT.COLOR_GRAY);
} }

4
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/Style.java
View file

@ -28,7 +28,7 @@ public class Style {
private final boolean fBlink; private final boolean fBlink;
private final boolean fUnderline; private final boolean fUnderline;
private final boolean fReverse; private final boolean fReverse;
private final static Map fgStyles=new HashMap(); private final static Map<Style, Style> fgStyles=new HashMap<Style, Style>();
private Style(StyleColor forground, StyleColor background, boolean bold, boolean blink, boolean underline, boolean reverse) { private Style(StyleColor forground, StyleColor background, boolean bold, boolean blink, boolean underline, boolean reverse) {
fForground = forground; fForground = forground;
fBackground = background; fBackground = background;
@ -41,7 +41,7 @@ public class Style {
Style style = new Style(forground,background, bold, blink,underline,reverse); Style style = new Style(forground,background, bold, blink,underline,reverse);
Style cached; Style cached;
synchronized (fgStyles) { synchronized (fgStyles) {
cached=(Style) fgStyles.get(style); cached=fgStyles.get(style);
if(cached==null) { if(cached==null) {
cached=style; cached=style;
fgStyles.put(cached, cached); fgStyles.put(cached, cached);

4
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/terminal/model/StyleColor.java
View file

@ -19,7 +19,7 @@ import java.util.Map;
* Threadsafe. * Threadsafe.
*/ */
public class StyleColor { public class StyleColor {
private final static Map fgStyleColors=new HashMap(); private final static Map<String, StyleColor> fgStyleColors=new HashMap<String, StyleColor>();
final String fName; final String fName;
/** /**
@ -30,7 +30,7 @@ public class StyleColor {
public static StyleColor getStyleColor(String name) { public static StyleColor getStyleColor(String name) {
StyleColor result; StyleColor result;
synchronized (fgStyleColors) { synchronized (fgStyleColors) {
result=(StyleColor) fgStyleColors.get(name); result=fgStyleColors.get(name);
if(result==null) { if(result==null) {
result=new StyleColor(name); result=new StyleColor(name);
fgStyleColors.put(name, result); fgStyleColors.put(name, result);

2
plugins/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true 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-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.junit, Require-Bundle: org.junit,

2
plugins/org.eclipse.tm.terminal.test/pom.xml
View file

@ -11,7 +11,7 @@
<relativePath>../../admin/pom-build.xml</relativePath> <relativePath>../../admin/pom-build.xml</relativePath>
</parent> </parent>
<version>4.0.0-SNAPSHOT</version> <version>4.0.100-SNAPSHOT</version>
<artifactId>org.eclipse.tm.terminal.test</artifactId> <artifactId>org.eclipse.tm.terminal.test</artifactId>
<packaging>eclipse-test-plugin</packaging> <packaging>eclipse-test-plugin</packaging>

1
plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java
View file

@ -21,7 +21,6 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell; 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.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;

1
plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java
View file

@ -21,7 +21,6 @@ import junit.framework.TestCase;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.tm.internal.terminal.connector.TerminalConnector.Factory; 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.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState; import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;