remove BanService from Context

spring · Mar 19, 2011 · 546b38b · 546b38b
1 parent 2feddb5
commit 546b38b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/src/main/java/com/springrts/springls/Context.java b/src/main/java/com/springrts/springls/Context.java
@@ -19,7 +19,6 @@
 
 
 import com.springrts.springls.accounts.AccountsService;
-import com.springrts.springls.bans.BanService;
 import com.springrts.springls.commands.CommandProcessors;
 import java.util.LinkedList;
 import java.util.List;
@@ -38,7 +37,6 @@ public class Context implements LiveStateListener {
 
 	private Framework framework;
 	private AccountsService accountsService;
-	private BanService banService;
 	private Battles battles;
 	private Channels channels;
 	private Clients clients;
@@ -56,7 +54,6 @@ public Context() {
 
 		this.framework = null;
 		this.accountsService = null;
-		this.banService = null;
 		this.battles = null;
 		this.channels = null;
 		this.clients = null;
@@ -70,7 +67,6 @@ public Context() {
 	public void init() {
 
 		this.accountsService = null;
-		this.banService = null;
 		setBattles(new Battles());
 		setChannels(new Channels());
 		setClients(new Clients());
@@ -170,15 +166,6 @@ public void setAccountsService(AccountsService accountsService) {
 		addLiveStateListener(accountsService);
 	}
 
-	public BanService getBanService() {
-		return banService;
-	}
-
-	public void setBanService(BanService banService) {
-
-		this.banService = banService;
-	}
-
 	public Battles getBattles() {
 		return battles;
 	}

diff --git a/src/main/java/com/springrts/springls/bans/Activator.java b/src/main/java/com/springrts/springls/bans/Activator.java
@@ -41,7 +41,6 @@ public void start(BundleContext context) {
 
 		Context springLsContext = Context.getService(context, Context.class);
 		BanService banService = createBanService(springLsContext);
-		springLsContext.setBanService(banService);
 		context.registerService(BanService.class.getName(), banService, null);
 	}
 

diff --git a/src/main/java/com/springrts/springls/commands/impl/LoginCommandProcessor.java b/src/main/java/com/springrts/springls/commands/impl/LoginCommandProcessor.java
@@ -26,6 +26,7 @@
 import com.springrts.springls.util.Misc;
 import com.springrts.springls.ServerNotification;
 import com.springrts.springls.agreement.Agreement;
+import com.springrts.springls.bans.BanService;
 import com.springrts.springls.commands.AbstractCommandProcessor;
 import com.springrts.springls.commands.CommandProcessingException;
 import com.springrts.springls.commands.InvalidNumberOfArgumentsCommandProcessingException;
@@ -275,15 +276,19 @@ private boolean validateAccount(Client client, int userId, String username,
 				client.sendLine("DENIED Already logged in");
 				return false;
 			}
-			BanEntry ban = getContext().getBanService().getBanEntry(username,
-					client.getIp(), userId);
-			if ((ban != null) && ban.isActive()) {
-				client.sendLine(String.format(
-						"DENIED You are banned from this server! (Reason: %s)."
-						+ " Please contact a server administrator.",
-						ban.getPublicReason()));
-				recordFailedLoginAttempt(username);
-				return false;
+			BanService banService = getContext().getService(BanService.class);
+			if (banService != null) {
+				BanEntry ban = banService.getBanEntry(username, client.getIp(),
+						userId);
+				if ((ban != null) && ban.isActive()) {
+					client.sendLine(String.format(
+							"DENIED You are banned from this server!"
+							+ " (Reason: %s)."
+							+ " Please contact a server administrator.",
+							ban.getPublicReason()));
+					recordFailedLoginAttempt(username);
+					return false;
+				}
 			}
 			if (!acc.isAgreementAccepted()
 					&& !client.getAccount().isAgreementAccepted())