From f9b67a6411d4885e8f1efe5aec7f8675bfe880b8 Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Mon, 23 Feb 2015 15:52:05 +0100 Subject: [PATCH] Terminal: Fix findbugs warnings --- .../terminal/connector/TerminalConnectorFactoryTest.java | 6 +++--- .../internal/terminal/connector/TerminalConnectorTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java index 3971d311653..ae3d55872c6 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java +++ b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorFactoryTest.java @@ -97,7 +97,7 @@ public class TerminalConnectorFactoryTest extends TestCase { public boolean fEcho; public int fWidth; public int fHeight; - public ITerminalControl fControl; + public ITerminalControl fTerminalControl; public ISettingsStore fSaveStore; public ISettingsStore fLoadStore; public boolean fDisconnect; @@ -111,7 +111,7 @@ public class TerminalConnectorFactoryTest extends TestCase { } public void connect(ITerminalControl control) { super.connect(control); - fControl = control; + fTerminalControl = control; } public void doDisconnect() { fDisconnect=true; @@ -225,7 +225,7 @@ public class TerminalConnectorFactoryTest extends TestCase { TerminalConnector c = makeTerminalConnector(mock); TerminalControlMock control=new TerminalControlMock(); c.connect(control); - assertSame(mock.fControl,control); + assertSame(mock.fTerminalControl,control); } public void testGetSettingsSummary() { TerminalConnector c=makeTerminalConnector(); diff --git a/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java index f1643cb4a56..23b649c2aa9 100644 --- a/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java +++ b/terminal/plugins/org.eclipse.tm.terminal.test/src/org/eclipse/tm/internal/terminal/connector/TerminalConnectorTest.java @@ -97,7 +97,7 @@ public class TerminalConnectorTest extends TestCase { public boolean fEcho; public int fWidth; public int fHeight; - public ITerminalControl fControl; + public ITerminalControl fTerminalControl; public ISettingsStore fSaveStore; public ISettingsStore fLoadStore; public boolean fDisconnect; @@ -111,7 +111,7 @@ public class TerminalConnectorTest extends TestCase { } public void connect(ITerminalControl control) { super.connect(control); - fControl = control; + fTerminalControl = control; } public void doDisconnect() { fDisconnect=true; @@ -203,7 +203,7 @@ public class TerminalConnectorTest extends TestCase { TerminalConnector c=new TerminalConnector(new SimpleFactory(mock),"xID","xName", false); TerminalControlMock control=new TerminalControlMock(); c.connect(control); - assertSame(mock.fControl,control); + assertSame(mock.fTerminalControl,control); } public void testGetSettingsSummary() {