Importing SVN archives - Trunk

legacyworlds-server/legacyworlds-server-beans/legacyworlds-server-beans-user/pom.xml

@@ -4,12 +4,12 @@
 	<parent>
 		<artifactId>legacyworlds-server-beans</artifactId>
 		<groupId>com.deepclone.lw</groupId>
-		<version>5.99.1</version>
+		<version>5.99.2</version>
 	</parent>
 
 	<groupId>com.deepclone.lw</groupId>
 	<artifactId>legacyworlds-server-beans-user</artifactId>
-	<version>5.99.1</version>
+	<version>5.99.2</version>
 	<name>Legacy Worlds server - user actions</name>
 	<description>This module defines beans and classes that handle user actions.</description>
 </project>

legacyworlds-server/legacyworlds-server-beans/legacyworlds-server-beans-user/src/main/java/com/deepclone/lw/beans/user/admin/main/techs/ListCategoriesCommandDelegateBean.java

@@ -0,0 +1,59 @@
+package com.deepclone.lw.beans.user.admin.main.techs;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.deepclone.lw.beans.user.abst.AutowiredCommandDelegate;
+import com.deepclone.lw.beans.user.abst.SessionCommandHandler;
+import com.deepclone.lw.beans.user.admin.common.AdminOperation;
+import com.deepclone.lw.beans.user.admin.main.AdminCommandsBean;
+import com.deepclone.lw.cmd.admin.adata.Administrator;
+import com.deepclone.lw.cmd.admin.adata.Privileges;
+import com.deepclone.lw.cmd.admin.techs.ListCategoriesCommand;
+import com.deepclone.lw.cmd.admin.techs.ListCategoriesResponse;
+import com.deepclone.lw.interfaces.game.techs.TechnologyGraphManager;
+import com.deepclone.lw.interfaces.session.ServerSession;
+import com.deepclone.lw.session.Command;
+import com.deepclone.lw.session.CommandResponse;
+
+
+
+public class ListCategoriesCommandDelegateBean
+		extends AdminOperation
+		implements AutowiredCommandDelegate
+{
+	private TechnologyGraphManager manager;
+
+
+	@Autowired( required = true )
+	public void setManager( TechnologyGraphManager manager )
+	{
+		this.manager = manager;
+	}
+
+
+	@Override
+	public Class< ? extends SessionCommandHandler > getCommandHandler( )
+	{
+		return AdminCommandsBean.class;
+	}
+
+
+	@Override
+	public Class< ? extends Command > getType( )
+	{
+		return ListCategoriesCommand.class;
+	}
+
+
+	@Override
+	public CommandResponse execute( ServerSession session , Command command )
+	{
+		Administrator admin = this.getAdministrator( session );
+		if ( !admin.hasPrivilege( Privileges.GDAT ) ) {
+			return new ListCategoriesResponse( admin );
+		}
+		return new ListCategoriesResponse( admin , this.manager.listCategories( ) );
+	}
+
+}

legacyworlds-server/legacyworlds-server-beans/legacyworlds-server-beans-user/src/main/java/com/deepclone/lw/beans/user/player/game/techs/ImplementTechCommandDelegateBean.java

@@ -1,4 +1,4 @@
-package com.deepclone.lw.beans.user.player.game;
+package com.deepclone.lw.beans.user.player.game.techs;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,8 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.deepclone.lw.beans.user.abst.AutowiredCommandDelegate;
 import com.deepclone.lw.beans.user.abst.SessionCommandHandler;
 import com.deepclone.lw.beans.user.player.GameSubTypeBean;
-import com.deepclone.lw.cmd.player.ImplementTechCommand;
-import com.deepclone.lw.interfaces.game.EmpireManagement;
+import com.deepclone.lw.cmd.player.research.ImplementTechCommand;
+import com.deepclone.lw.cmd.player.research.ResearchOperationResponse;
+import com.deepclone.lw.interfaces.game.techs.EmpireTechnologyManager;
 import com.deepclone.lw.interfaces.session.ServerSession;
 import com.deepclone.lw.session.Command;
 import com.deepclone.lw.session.CommandResponse;
@@ -19,13 +20,13 @@ public class ImplementTechCommandDelegateBean
 
 {
 
-	private EmpireManagement empireManagement;
+	private EmpireTechnologyManager techManagement;
 
 
 	@Autowired( required = true )
-	public void setEmpireManager( EmpireManagement manager )
+	public void setEmpireManager( EmpireTechnologyManager manager )
 	{
-		this.empireManagement = manager;
+		this.techManagement = manager;
 	}
 
 
@@ -49,8 +50,8 @@ public class ImplementTechCommandDelegateBean
 		ImplementTechCommand command = (ImplementTechCommand) cParam;
 		int empireId = session.get( "empireId" , Integer.class );
 		if ( session.get( "vacation" , Boolean.class ) ) {
-			return this.empireManagement.getOverview( empireId );
+			return new ResearchOperationResponse( );
 		}
-		return this.empireManagement.implementTechnology( empireId , command.getTech( ) );
+		return this.techManagement.implementTechnology( empireId , command.getTech( ) );
 	}
 }

legacyworlds-server/legacyworlds-server-beans/legacyworlds-server-beans-user/src/main/java/com/deepclone/lw/beans/user/player/game/techs/SetResearchPrioritiesCommandDelegateBean.java

@@ -0,0 +1,56 @@
+package com.deepclone.lw.beans.user.player.game.techs;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.deepclone.lw.beans.user.abst.AutowiredCommandDelegate;
+import com.deepclone.lw.beans.user.abst.SessionCommandHandler;
+import com.deepclone.lw.beans.user.player.GameSubTypeBean;
+import com.deepclone.lw.cmd.player.research.ResearchOperationResponse;
+import com.deepclone.lw.cmd.player.research.SetResearchPrioritiesCommand;
+import com.deepclone.lw.interfaces.game.techs.EmpireTechnologyManager;
+import com.deepclone.lw.interfaces.session.ServerSession;
+import com.deepclone.lw.session.Command;
+import com.deepclone.lw.session.CommandResponse;
+
+
+
+public class SetResearchPrioritiesCommandDelegateBean
+		implements AutowiredCommandDelegate
+{
+
+	private EmpireTechnologyManager techManagement;
+
+
+	@Autowired( required = true )
+	public void setEmpireManager( EmpireTechnologyManager manager )
+	{
+		this.techManagement = manager;
+	}
+
+
+	@Override
+	public Class< ? extends Command > getType( )
+	{
+		return SetResearchPrioritiesCommand.class;
+	}
+
+
+	@Override
+	public Class< ? extends SessionCommandHandler > getCommandHandler( )
+	{
+		return GameSubTypeBean.class;
+	}
+
+
+	@Override
+	public CommandResponse execute( ServerSession session , Command cParam )
+	{
+		SetResearchPrioritiesCommand command = (SetResearchPrioritiesCommand) cParam;
+		int empireId = session.get( "empireId" , Integer.class );
+		if ( session.get( "vacation" , Boolean.class ) ) {
+			return new ResearchOperationResponse( );
+		}
+		return this.techManagement.setResearchPriorities( empireId , command.getPriorities( ) );
+	}
+}

legacyworlds-server/legacyworlds-server-beans/legacyworlds-server-beans-user/src/main/java/com/deepclone/lw/beans/user/player/game/techs/ViewResearchCommandDelegateBean.java

@@ -0,0 +1,52 @@
+package com.deepclone.lw.beans.user.player.game.techs;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.deepclone.lw.beans.user.abst.AutowiredCommandDelegate;
+import com.deepclone.lw.beans.user.abst.SessionCommandHandler;
+import com.deepclone.lw.beans.user.player.GameSubTypeBean;
+import com.deepclone.lw.cmd.player.research.ViewResearchCommand;
+import com.deepclone.lw.interfaces.game.techs.EmpireTechnologyManager;
+import com.deepclone.lw.interfaces.session.ServerSession;
+import com.deepclone.lw.session.Command;
+import com.deepclone.lw.session.CommandResponse;
+
+
+
+public class ViewResearchCommandDelegateBean
+		implements AutowiredCommandDelegate
+{
+
+	private EmpireTechnologyManager techManagement;
+
+
+	@Autowired( required = true )
+	public void setEmpireManager( EmpireTechnologyManager manager )
+	{
+		this.techManagement = manager;
+	}
+
+
+	@Override
+	public Class< ? extends Command > getType( )
+	{
+		return ViewResearchCommand.class;
+	}
+
+
+	@Override
+	public Class< ? extends SessionCommandHandler > getCommandHandler( )
+	{
+		return GameSubTypeBean.class;
+	}
+
+
+	@Override
+	public CommandResponse execute( ServerSession session , Command cParam )
+	{
+		int empireId = session.get( "empireId" , Integer.class );
+		return this.techManagement.getResearchData( empireId );
+	}
+
+}

legacyworlds-server/legacyworlds-server-beans/legacyworlds-server-beans-user/src/main/resources/configuration/user/admin-session-definer-bean.xml

@@ -93,5 +93,8 @@
 	<bean class="com.deepclone.lw.beans.user.admin.main.mntm.EnableMaintenanceCommandDelegateBean" />
 	<bean class="com.deepclone.lw.beans.user.admin.main.mntm.EndMaintenanceCommandDelegateBean" />
 	<bean class="com.deepclone.lw.beans.user.admin.main.mntm.ExtendMaintenanceCommandDelegateBean" />
+	
+	<!-- Technology graph -->
+	<bean class="com.deepclone.lw.beans.user.admin.main.techs.ListCategoriesCommandDelegateBean" />
 
 </beans>

legacyworlds-server/legacyworlds-server-beans/legacyworlds-server-beans-user/src/main/resources/configuration/user/player-session-definer-bean.xml

@@ -44,8 +44,12 @@
 
 	<!-- Game: empire -->
 	<bean class="com.deepclone.lw.beans.user.player.game.OverviewCommandDelegateBean" />
-	<bean class="com.deepclone.lw.beans.user.player.game.ImplementTechCommandDelegateBean" />
 	<bean class="com.deepclone.lw.beans.user.player.game.GetNewPlanetCommandDelegateBean" />
+	
+	<!-- Game: technologies -->
+	<bean class="com.deepclone.lw.beans.user.player.game.techs.ViewResearchCommandDelegateBean" />
+	<bean class="com.deepclone.lw.beans.user.player.game.techs.ImplementTechCommandDelegateBean" />
+	<bean class="com.deepclone.lw.beans.user.player.game.techs.SetResearchPrioritiesCommandDelegateBean" />
 
 	<!-- Game: planet list -->
 	<bean class="com.deepclone.lw.beans.user.player.game.ListPlanetsCommandDelegateBean" />