From 7f851c46f4e76033caa13d80325dacae2654b7ce Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 22 Jan 2014 13:38:24 -0500 Subject: [PATCH] Drop code compliance to Java 1.5. Minor annotation changes for 1.5 compliance. --- moonlight-common/.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../src/com/limelight/nvstream/NvConnection.java | 6 ------ .../src/com/limelight/nvstream/control/ControlStream.java | 2 -- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/moonlight-common/.settings/org.eclipse.jdt.core.prefs b/moonlight-common/.settings/org.eclipse.jdt.core.prefs index 8000cd6c..416f4fb6 100644 --- a/moonlight-common/.settings/org.eclipse.jdt.core.prefs +++ b/moonlight-common/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +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=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/moonlight-common/src/com/limelight/nvstream/NvConnection.java b/moonlight-common/src/com/limelight/nvstream/NvConnection.java index 67848486..3f79df32 100644 --- a/moonlight-common/src/com/limelight/nvstream/NvConnection.java +++ b/moonlight-common/src/com/limelight/nvstream/NvConnection.java @@ -288,7 +288,6 @@ public class NvConnection { this.videoDecoderRenderer = videoDecoderRenderer; new Thread(new Runnable() { - @Override public void run() { try { hostAddr = InetAddress.getByName(host); @@ -308,7 +307,6 @@ public class NvConnection { return; threadPool.execute(new Runnable() { - @Override public void run() { try { inputStream.sendMouseMove(deltaX, deltaY); @@ -325,7 +323,6 @@ public class NvConnection { return; threadPool.execute(new Runnable() { - @Override public void run() { try { inputStream.sendMouseButtonDown(mouseButton); @@ -342,7 +339,6 @@ public class NvConnection { return; threadPool.execute(new Runnable() { - @Override public void run() { try { inputStream.sendMouseButtonUp(mouseButton); @@ -362,7 +358,6 @@ public class NvConnection { return; threadPool.execute(new Runnable() { - @Override public void run() { try { inputStream.sendControllerInput(buttonFlags, leftTrigger, @@ -380,7 +375,6 @@ public class NvConnection { return; threadPool.execute(new Runnable() { - @Override public void run() { try { inputStream.sendKeyboardInput(keyMap, keyDirection, modifier); diff --git a/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java b/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java index 72e0e1e8..9d40ded5 100644 --- a/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java +++ b/moonlight-common/src/com/limelight/nvstream/control/ControlStream.java @@ -400,12 +400,10 @@ public class ControlStream implements ConnectionStatusListener { } } - @Override public void connectionTerminated() { abort(); } - @Override public void connectionNeedsResync() { synchronized (resyncNeeded) { // Wake up the resync thread