From 45892fdc836f03d88ff75e032e2601d4561044df Mon Sep 17 00:00:00 2001
From: tacef ine <tacef@projectswg.com>
Date: Thu, 26 Jan 2017 18:26:31 +0100
Subject: [PATCH] Update to former Pullrequest

---
 .../collections/CollectionBadgeManager.java      |  6 +++---
 .../collections/ExplorationBadgeService.java     |  2 +-
 src/services/objects/RadialService.java          | 16 ++++++++--------
 src/services/objects/StaticItemService.java      | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/services/collections/CollectionBadgeManager.java b/src/services/collections/CollectionBadgeManager.java
index 016170a00..cf3b96899 100644
--- a/src/services/collections/CollectionBadgeManager.java
+++ b/src/services/collections/CollectionBadgeManager.java
@@ -72,9 +72,9 @@ public class CollectionBadgeManager extends Manager {
 	}
 
 	private void handleGrantClickyCollectionIntent(GrantClickyCollectionIntent gcci){
-		CreatureObject creo = ((GrantClickyCollectionIntent) gcci).getCreature();
-		SWGObject inventoryItem = ((GrantClickyCollectionIntent) gcci).getInventoryItem();
-		CollectionItem collection = ((GrantClickyCollectionIntent) gcci).getCollection();
+		CreatureObject creo = gcci.getCreature();
+		SWGObject inventoryItem = gcci.getInventoryItem();
+		CollectionItem collection = gcci.getCollection();
 
 		handleCollectionBadge(creo, inventoryItem, collection);
 	}
diff --git a/src/services/collections/ExplorationBadgeService.java b/src/services/collections/ExplorationBadgeService.java
index 0c791439d..cf148d592 100644
--- a/src/services/collections/ExplorationBadgeService.java
+++ b/src/services/collections/ExplorationBadgeService.java
@@ -55,7 +55,7 @@ public class ExplorationBadgeService extends Service {
 	}
 		
 	private void handlePlayerTransformedIntent(PlayerTransformedIntent pti){
-		String badgeName = checkExplorationRegions(((PlayerTransformedIntent) pti).getPlayer());
+		String badgeName = checkExplorationRegions(pti.getPlayer());
 		if (badgeName != null){
 			new GrantBadgeIntent(pti.getPlayer(), badgeName).broadcast();
 		}
diff --git a/src/services/objects/RadialService.java b/src/services/objects/RadialService.java
index 8aec5fde1..f0c65b123 100644
--- a/src/services/objects/RadialService.java
+++ b/src/services/objects/RadialService.java
@@ -58,7 +58,7 @@ public class RadialService extends Service {
 
 		registerForIntent(GalacticPacketIntent.class, gpi -> handleGalacticPacketIntent(gpi));
 		registerForIntent(RadialResponseIntent.class, rri -> handleRadialResponseIntent(rri));
-		registerForIntent(RadialRegisterIntent.class, rrei -> handleRadialRegisterIntent(rrei));
+		registerForIntent(RadialRegisterIntent.class, rri -> handleRadialRegisterIntent(rri));
 	}
 
 	private void handleGalacticPacketIntent(GalacticPacketIntent gpi){
@@ -70,12 +70,12 @@ public class RadialService extends Service {
 		}
 	}
 	
-	private void handleRadialRegisterIntent(RadialRegisterIntent rrei){
+	private void handleRadialRegisterIntent(RadialRegisterIntent rri){
 		synchronized (templatesRegistered) {
-			if (rrei.isRegister()) {
-				templatesRegistered.addAll(rrei.getTemplates());
+			if (rri.isRegister()) {
+				templatesRegistered.addAll(rri.getTemplates());
 			} else {
-				templatesRegistered.removeAll(rrei.getTemplates());
+				templatesRegistered.removeAll(rri.getTemplates());
 			}
 		}
 	}
@@ -98,9 +98,9 @@ public class RadialService extends Service {
 		new RadialRequestIntent(player, target, request).broadcast();
 	}
 
-	private void handleRadialResponseIntent(RadialResponseIntent response) {
-		Player player = response.getPlayer();
-		sendResponse(player, response.getTarget(), response.getOptions(), response.getCounter());
+	private void handleRadialResponseIntent(RadialResponseIntent rri) {
+		Player player = rri.getPlayer();
+		sendResponse(player, rri.getTarget(), rri.getOptions(), rri.getCounter());
 	}
 
 	private void onSelection(GalacticManager galacticManager, Player player, ObjectMenuSelect select) {
diff --git a/src/services/objects/StaticItemService.java b/src/services/objects/StaticItemService.java
index 0206ae76c..b25a1ef71 100644
--- a/src/services/objects/StaticItemService.java
+++ b/src/services/objects/StaticItemService.java
@@ -158,11 +158,11 @@ public final class StaticItemService extends Service {
 		Log.i(this, "Static items have been disabled");
 	}
 
-	private void handleCreateStaticItemIntent(CreateStaticItemIntent cssi) {
-		SWGObject container = cssi.getContainer();
-		String[] itemNames = cssi.getItemNames();
-		Player requesterOwner = cssi.getRequester().getOwner();
-		ObjectCreationHandler objectCreationHandler = cssi.getObjectCreationHandler();
+	private void handleCreateStaticItemIntent(CreateStaticItemIntent csii) {
+		SWGObject container = csii.getContainer();
+		String[] itemNames = csii.getItemNames();
+		Player requesterOwner = csii.getRequester().getOwner();
+		ObjectCreationHandler objectCreationHandler = csii.getObjectCreationHandler();
 		
 		// If adding these items to the container would exceed the max capacity...
 		if(!objectCreationHandler.isIgnoreVolume() && container.getVolume() + itemNames.length > container.getMaxContainerSize()) {