[DEECo] [d3scomp/JDEECo] 031651: Simplify L2 network code

[GitHub]

  Branch: refs/heads/network
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 0316515442c7884218b8bba7d15767d005a87118
      https://github.com/d3scomp/JDEECo/commit/0316515442c7884218b8bba7d15767d005a87118
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/PacketHeader.java

  Log Message:
  -----------
  Simplify L2 network code


  Commit: e8af6730689ec5c866680bd6926254495cb3f646
      https://github.com/d3scomp/JDEECo/commit/e8af6730689ec5c866680bd6926254495cb3f646
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshallingTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallingTest.java

  Log Message:
  -----------
  Move L2 and marshalling tests to correct packeges


  Commit: 93331307c6f4985c76ffa0497301859737387957
      https://github.com/d3scomp/JDEECo/commit/93331307c6f4985c76ffa0497301859737387957
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Device.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/IPAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/MANETBroadcastAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Strategy.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

  Log Message:
  -----------
  Merge branch 'network' of https://github.com/d3scomp/JDEECo.git into
network

Conflicts:
	jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java


  Commit: 7b8dcd3afd10c3d68a6ab72b4eaccdc45c305ed5
      https://github.com/d3scomp/JDEECo/commit/7b8dcd3afd10c3d68a6ab72b4eaccdc45c305ed5
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java

  Log Message:
  -----------
  Add network plugin class


Compare: https://github.com/d3scomp/JDEECo/compare/11be907edb7e...7b8dcd3afd10