Renamed networklib to jsettlers.network (for unified naming)

jsettlers · Mar 26, 2015 · 63045cf · 63045cf
1 parent 39eddf8
commit 63045cf
Show file tree

Hide file tree

Showing 168 changed files with 6,497 additions and 6,467 deletions.
diff --git a/build.ant b/build.ant
@@ -6,12 +6,12 @@
 	</target>
 
 	<target name="buildDedicatedServer">
-		<ant antfile="networklib/build/buildDedicatedServer.ant" useNativeBasedir="true" inheritAll="false" target="buildDedicatedServer" />
+		<ant antfile="jsettlers.network/build/buildDedicatedServer.ant" useNativeBasedir="true" inheritAll="false" target="buildDedicatedServer" />
 	</target>
 
 	<target name="runUnitTests">
 		<ant antfile="jsettlers.tests/build/build.ant" useNativeBasedir="true" inheritAll="false" target="unitTests" />
-		<ant antfile="jsettlers.tests/build/build.ant" useNativeBasedir="true" inheritAll="false" target="unitTests.networklib" />
+		<ant antfile="jsettlers.tests/build/build.ant" useNativeBasedir="true" inheritAll="false" target="unitTests.network" />
 	</target>
 
 	<target name="buildAll" depends="runUnitTests,buildSwing,buildDedicatedServer" />

diff --git a/jsettlers.logic/.classpath b/jsettlers.logic/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jsettlers.graphics"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jsettlers.common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/networklib"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jsettlers.network"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jsettlers.logic/build/build.ant b/jsettlers.logic/build/build.ant
@@ -12,7 +12,7 @@
     <property name="go.graphics.location" value="../go.graphics"/>
     <property name="jsettlers.common.location" value="../jsettlers.common"/>
     <property name="jsettlers.graphics.location" value="../jsettlers.graphics"/>
-    <property name="networklib.location" value="../networklib"/>
+    <property name="jsettlers.network.location" value="../jsettlers.network"/>
     <property name="debuglevel" value="source,lines,vars"/>
     <property name="target" value="1.7"/>
     <property name="source" value="1.7"/>
@@ -27,14 +27,14 @@
         <path refid="jsettlers.common.classpath"/>
         <path refid="go.graphics.classpath"/>
     </path>
-    <path id="networklib.classpath">
-        <pathelement location="${networklib.location}/bin"/>
+    <path id="jsettlers.network.classpath">
+        <pathelement location="${jsettlers.network.location}/bin"/>
     </path>
     <path id="jsettlers.logic.classpath">
         <pathelement location="bin"/>
         <path refid="jsettlers.graphics.classpath"/>
         <path refid="jsettlers.common.classpath"/>
-        <path refid="networklib.classpath"/>
+        <path refid="jsettlers.network.classpath"/>
     </path>
     <target name="init">
         <mkdir dir="bin"/>
@@ -52,7 +52,7 @@
         <ant antfile="build/build.ant" dir="${go.graphics.location}" inheritAll="false" target="clean"/>
         <ant antfile="build/build.ant" dir="${jsettlers.common.location}" inheritAll="false" target="clean"/>
         <ant antfile="build/build.ant" dir="${jsettlers.graphics.location}" inheritAll="false" target="clean"/>
-        <ant antfile="build/build.ant" dir="${networklib.location}" inheritAll="false" target="clean"/>
+        <ant antfile="build/build.ant" dir="${jsettlers.network.location}" inheritAll="false" target="clean"/>
     </target>
     <target depends="build-subprojects,build-project" name="build"/>
     <target name="build-subprojects">
@@ -71,7 +71,7 @@
                 <propertyref name="build.compiler"/>
             </propertyset>
         </ant>
-        <ant antfile="build/build.ant" dir="${networklib.location}" inheritAll="false" target="build-project">
+        <ant antfile="build/build.ant" dir="${jsettlers.network.location}" inheritAll="false" target="build-project">
             <propertyset>
                 <propertyref name="build.compiler"/>
             </propertyset>

diff --git a/jsettlers.logic/src/jsettlers/algorithms/construction/ConstructionMarksThread.java b/jsettlers.logic/src/jsettlers/algorithms/construction/ConstructionMarksThread.java
@@ -5,7 +5,7 @@
 import jsettlers.common.logging.MilliStopWatch;
 import jsettlers.common.logging.StopWatch;
 import jsettlers.common.map.shapes.MapRectangle;
-import networklib.client.interfaces.IPausingSupplier;
+import jsettlers.network.client.interfaces.IPausingSupplier;
 
 /**
  * Thread to calculate the markings for the user if he want's to construct a new building.<br>

diff --git a/jsettlers.logic/src/jsettlers/algorithms/path/area/InAreaFinder.java b/jsettlers.logic/src/jsettlers/algorithms/path/area/InAreaFinder.java
@@ -3,7 +3,7 @@
 import jsettlers.algorithms.path.IPathCalculatable;
 import jsettlers.common.material.ESearchType;
 import jsettlers.common.position.ShortPoint2D;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/input/GuiInterface.java b/jsettlers.logic/src/jsettlers/input/GuiInterface.java
@@ -44,8 +44,8 @@
 import jsettlers.logic.constants.MatchConstants;
 import jsettlers.logic.movable.interfaces.IDebugable;
 import jsettlers.logic.movable.interfaces.IIDable;
-import networklib.client.interfaces.IGameClock;
-import networklib.client.interfaces.ITaskScheduler;
+import jsettlers.network.client.interfaces.IGameClock;
+import jsettlers.network.client.interfaces.ITaskScheduler;
 
 /**
  * Class to handle the events provided by the user through jsettlers.graphics.

diff --git a/jsettlers.logic/src/jsettlers/input/GuiTaskExecutor.java b/jsettlers.logic/src/jsettlers/input/GuiTaskExecutor.java
@@ -22,8 +22,8 @@
 import jsettlers.logic.buildings.Building;
 import jsettlers.logic.buildings.military.OccupyingBuilding;
 import jsettlers.logic.movable.Movable;
-import networklib.client.task.packets.TaskPacket;
-import networklib.synchronic.timer.ITaskExecutor;
+import jsettlers.network.client.task.packets.TaskPacket;
+import jsettlers.network.synchronic.timer.ITaskExecutor;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/input/tasks/SimpleGuiTask.java b/jsettlers.logic/src/jsettlers/input/tasks/SimpleGuiTask.java
@@ -5,7 +5,7 @@
 import java.io.IOException;
 
 import jsettlers.common.position.ShortPoint2D;
-import networklib.client.task.packets.TaskPacket;
+import jsettlers.network.client.task.packets.TaskPacket;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/logic/buildings/military/OccupyingBuilding.java b/jsettlers.logic/src/jsettlers/logic/buildings/military/OccupyingBuilding.java
@@ -29,7 +29,7 @@
 import jsettlers.logic.movable.interfaces.IAttackableMovable;
 import jsettlers.logic.objects.StandardMapObject;
 import jsettlers.logic.player.Player;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * This is a tower building that can request soldiers and let them defend the tower.

diff --git a/jsettlers.logic/src/jsettlers/logic/constants/MatchConstants.java b/jsettlers.logic/src/jsettlers/logic/constants/MatchConstants.java
@@ -1,6 +1,6 @@
 package jsettlers.logic.constants;
 
-import networklib.client.interfaces.IGameClock;
+import jsettlers.network.client.interfaces.IGameClock;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/logic/map/newGrid/GameSerializer.java b/jsettlers.logic/src/jsettlers/logic/map/newGrid/GameSerializer.java
@@ -6,7 +6,7 @@
 
 import jsettlers.common.map.MapLoadException;
 import jsettlers.logic.constants.MatchConstants;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * This class serializes and deserializes the {@link MainGrid} and therefore the complete game state.

diff --git a/jsettlers.logic/src/jsettlers/logic/map/newGrid/landscape/LandscapeGrid.java b/jsettlers.logic/src/jsettlers/logic/map/newGrid/landscape/LandscapeGrid.java
@@ -13,7 +13,7 @@
 import jsettlers.common.position.ShortPoint2D;
 import jsettlers.logic.map.newGrid.flags.IProtectedProvider;
 import jsettlers.logic.map.newGrid.flags.IProtectedProvider.IProtectedChangedListener;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * This grid stores the height and the {@link ELandscapeType} of every position.

diff --git a/jsettlers.logic/src/jsettlers/logic/map/newGrid/objects/MapObjectsManager.java b/jsettlers.logic/src/jsettlers/logic/map/newGrid/objects/MapObjectsManager.java
@@ -35,7 +35,7 @@
 import jsettlers.logic.player.Player;
 import jsettlers.logic.timer.IScheduledTimerable;
 import jsettlers.logic.timer.RescheduleTimer;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * This class manages the MapObjects on the grid. It handles timed events like growth interrupts of a tree or deletion of arrows.

diff --git a/...p/newGrid/partition/manager/materials/requests/MaterialsForBuildingsRequestPrioQueue.java b/...p/newGrid/partition/manager/materials/requests/MaterialsForBuildingsRequestPrioQueue.java
@@ -10,7 +10,7 @@
 import jsettlers.common.material.EPriority;
 import jsettlers.common.position.ShortPoint2D;
 import jsettlers.common.utils.collections.list.DoubleLinkedList;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * This class is an advanced priority queue for material requests. The requests are served according to the settings. The settings specify the

diff --git a/jsettlers.logic/src/jsettlers/logic/movable/Movable.java b/jsettlers.logic/src/jsettlers/logic/movable/Movable.java
@@ -33,7 +33,7 @@
 import jsettlers.logic.player.Player;
 import jsettlers.logic.timer.IScheduledTimerable;
 import jsettlers.logic.timer.RescheduleTimer;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * Central Movable class of JSettlers.

diff --git a/jsettlers.logic/src/jsettlers/logic/movable/strategies/BuildingWorkerStrategy.java b/jsettlers.logic/src/jsettlers/logic/movable/strategies/BuildingWorkerStrategy.java
@@ -20,7 +20,7 @@
 import jsettlers.logic.map.newGrid.partition.manager.manageables.interfaces.IWorkerRequestBuilding;
 import jsettlers.logic.movable.Movable;
 import jsettlers.logic.movable.MovableStrategy;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/logic/movable/strategies/DiggerStrategy.java b/jsettlers.logic/src/jsettlers/logic/movable/strategies/DiggerStrategy.java
@@ -8,7 +8,7 @@
 import jsettlers.logic.map.newGrid.partition.manager.manageables.interfaces.IDiggerRequester;
 import jsettlers.logic.movable.Movable;
 import jsettlers.logic.movable.MovableStrategy;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 public final class DiggerStrategy extends MovableStrategy implements IManageableDigger {
 	private static final long serialVersionUID = 1581926355853324624L;

diff --git a/jsettlers.logic/src/jsettlers/logic/movable/strategies/FleeStrategy.java b/jsettlers.logic/src/jsettlers/logic/movable/strategies/FleeStrategy.java
@@ -6,7 +6,7 @@
 import jsettlers.logic.constants.Constants;
 import jsettlers.logic.movable.Movable;
 import jsettlers.logic.movable.MovableStrategy;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/logic/objects/ProgressingObject.java b/jsettlers.logic/src/jsettlers/logic/objects/ProgressingObject.java
@@ -3,7 +3,7 @@
 import jsettlers.common.position.ShortPoint2D;
 import jsettlers.logic.constants.MatchConstants;
 import jsettlers.logic.map.newGrid.objects.AbstractObjectsManagerObject;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/logic/objects/RessourceSignMapObject.java b/jsettlers.logic/src/jsettlers/logic/objects/RessourceSignMapObject.java
@@ -4,7 +4,7 @@
 import jsettlers.common.mapobject.EMapObjectType;
 import jsettlers.common.position.ShortPoint2D;
 import jsettlers.logic.map.newGrid.objects.AbstractObjectsManagerObject;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 public final class RessourceSignMapObject extends AbstractObjectsManagerObject {
 	private static final long serialVersionUID = -7248748388147081545L;

diff --git a/jsettlers.logic/src/jsettlers/logic/statistics/GameStatistics.java b/jsettlers.logic/src/jsettlers/logic/statistics/GameStatistics.java
@@ -3,7 +3,7 @@
 import jsettlers.common.material.EMaterialType;
 import jsettlers.common.movable.EMovableType;
 import jsettlers.common.statistics.IStatisticable;
-import networklib.client.interfaces.IGameClock;
+import jsettlers.network.client.interfaces.IGameClock;
 
 /**
  * This class supplies the UI with statistics of the game.

diff --git a/jsettlers.logic/src/jsettlers/logic/timer/RescheduleTimer.java b/jsettlers.logic/src/jsettlers/logic/timer/RescheduleTimer.java
@@ -8,8 +8,8 @@
 
 import jsettlers.common.map.MapLoadException;
 import jsettlers.logic.constants.MatchConstants;
-import networklib.client.interfaces.IGameClock;
-import networklib.synchronic.timer.INetworkTimerable;
+import jsettlers.network.client.interfaces.IGameClock;
+import jsettlers.network.synchronic.timer.INetworkTimerable;
 
 public final class RescheduleTimer implements INetworkTimerable, Serializable {
 	private static final long serialVersionUID = -1962430988827211391L;

diff --git a/jsettlers.logic/src/jsettlers/main/AsyncNetworkClientConnector.java b/jsettlers.logic/src/jsettlers/main/AsyncNetworkClientConnector.java
@@ -3,12 +3,12 @@
 import java.io.IOException;
 import java.net.UnknownHostException;
 
-import networklib.NetworkConstants.ENetworkKey;
-import networklib.client.NetworkClient;
-import networklib.client.interfaces.INetworkClient;
-import networklib.client.receiver.IPacketReceiver;
-import networklib.common.packets.ArrayOfMatchInfosPacket;
-import networklib.infrastructure.channel.reject.RejectPacket;
+import jsettlers.network.NetworkConstants.ENetworkKey;
+import jsettlers.network.client.NetworkClient;
+import jsettlers.network.client.interfaces.INetworkClient;
+import jsettlers.network.client.receiver.IPacketReceiver;
+import jsettlers.network.common.packets.ArrayOfMatchInfosPacket;
+import jsettlers.network.infrastructure.channel.reject.RejectPacket;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/main/JSettlersGame.java b/jsettlers.logic/src/jsettlers/main/JSettlersGame.java
@@ -36,10 +36,10 @@
 import jsettlers.logic.movable.Movable;
 import jsettlers.logic.statistics.GameStatistics;
 import jsettlers.logic.timer.RescheduleTimer;
-import networklib.client.OfflineNetworkConnector;
-import networklib.client.interfaces.IGameClock;
-import networklib.client.interfaces.INetworkConnector;
-import networklib.synchronic.random.RandomSingleton;
+import jsettlers.network.client.OfflineNetworkConnector;
+import jsettlers.network.client.interfaces.IGameClock;
+import jsettlers.network.client.interfaces.INetworkConnector;
+import jsettlers.network.synchronic.random.RandomSingleton;
 
 /**
  * This class can start a Thread that loads and sets up a game and wait's for its termination.

diff --git a/jsettlers.logic/src/jsettlers/main/MultiplayerConnector.java b/jsettlers.logic/src/jsettlers/main/MultiplayerConnector.java
@@ -9,10 +9,10 @@
 import jsettlers.graphics.startscreen.interfaces.IMultiplayerConnector;
 import jsettlers.graphics.startscreen.interfaces.IOpenMultiplayerGameInfo;
 import jsettlers.main.datatypes.JoinableGame;
-import networklib.client.interfaces.INetworkClient;
-import networklib.client.receiver.IPacketReceiver;
-import networklib.common.packets.ArrayOfMatchInfosPacket;
-import networklib.common.packets.MatchInfoPacket;
+import jsettlers.network.client.interfaces.INetworkClient;
+import jsettlers.network.client.receiver.IPacketReceiver;
+import jsettlers.network.common.packets.ArrayOfMatchInfosPacket;
+import jsettlers.network.common.packets.MatchInfoPacket;
 
 /**
  * This class implements the {@link IMultiplayerConnector} interface and supports the UI with the list of available multiplayer games and allows to

diff --git a/jsettlers.logic/src/jsettlers/main/MultiplayerGame.java b/jsettlers.logic/src/jsettlers/main/MultiplayerGame.java
@@ -16,16 +16,16 @@
 import jsettlers.logic.map.save.MapList;
 import jsettlers.logic.map.save.loader.MapLoader;
 import jsettlers.main.datatypes.MultiplayerPlayer;
-import networklib.NetworkConstants;
-import networklib.client.interfaces.INetworkClient;
-import networklib.client.receiver.IPacketReceiver;
-import networklib.common.packets.ChatMessagePacket;
-import networklib.common.packets.MapInfoPacket;
-import networklib.common.packets.MatchInfoUpdatePacket;
-import networklib.common.packets.MatchStartPacket;
-import networklib.common.packets.PlayerInfoPacket;
-import networklib.infrastructure.channel.reject.RejectPacket;
-import networklib.server.match.EPlayerState;
+import jsettlers.network.NetworkConstants;
+import jsettlers.network.client.interfaces.INetworkClient;
+import jsettlers.network.client.receiver.IPacketReceiver;
+import jsettlers.network.common.packets.ChatMessagePacket;
+import jsettlers.network.common.packets.MapInfoPacket;
+import jsettlers.network.common.packets.MatchInfoUpdatePacket;
+import jsettlers.network.common.packets.MatchStartPacket;
+import jsettlers.network.common.packets.PlayerInfoPacket;
+import jsettlers.network.infrastructure.channel.reject.RejectPacket;
+import jsettlers.network.server.match.EPlayerState;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/main/datatypes/JoinableGame.java b/jsettlers.logic/src/jsettlers/main/datatypes/JoinableGame.java
@@ -3,7 +3,7 @@
 import jsettlers.graphics.startscreen.interfaces.IJoinableGame;
 import jsettlers.graphics.startscreen.interfaces.IMapDefinition;
 import jsettlers.logic.map.save.MapList;
-import networklib.common.packets.MatchInfoPacket;
+import jsettlers.network.common.packets.MatchInfoPacket;
 
 /**
  * This is a simple POJO implementing the {@link IJoinableGame} interface.

diff --git a/jsettlers.logic/src/jsettlers/main/datatypes/MultiplayerPlayer.java b/jsettlers.logic/src/jsettlers/main/datatypes/MultiplayerPlayer.java
@@ -1,7 +1,7 @@
 package jsettlers.main.datatypes;
 
 import jsettlers.graphics.startscreen.interfaces.IMultiplayerPlayer;
-import networklib.common.packets.PlayerInfoPacket;
+import jsettlers.network.common.packets.PlayerInfoPacket;
 
 /**
  * 

diff --git a/jsettlers.logic/src/jsettlers/main/replay/ReplayTool.java b/jsettlers.logic/src/jsettlers/main/replay/ReplayTool.java
@@ -13,9 +13,9 @@
 import jsettlers.logic.map.save.loader.MapLoader;
 import jsettlers.main.JSettlersGame;
 import jsettlers.main.ReplayStartInformation;
-import networklib.NetworkConstants;
-import networklib.client.OfflineNetworkConnector;
-import networklib.client.interfaces.INetworkConnector;
+import jsettlers.network.NetworkConstants;
+import jsettlers.network.client.OfflineNetworkConnector;
+import jsettlers.network.client.interfaces.INetworkConnector;
 
 public class ReplayTool {
 	public static void replayAndCreateSavegame(File replayFile, int targetGameTime) throws IOException {

diff --git a/jsettlers.main.android/.classpath b/jsettlers.main.android/.classpath
@@ -11,6 +11,6 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jsettlers.graphics.androidui"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/networklib"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/jsettlers.network"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/jsettlers.main.swing/.classpath b/jsettlers.main.swing/.classpath
@@ -8,6 +8,6 @@
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/jsettlers.graphics"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/jsettlers.graphics.swing"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/go.graphics.swing"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/networklib"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jsettlers.network"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>