From 744de6eed8408cd891c1c0a9874606ac5320f1a3 Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 30 Sep 2014 18:11:18 +0200 Subject: [PATCH] Updated collections locations. Updated license information --- Dorkbox-Util/.classpath | 2 +- Dorkbox-Util/LICENSE.TXT | 16 +++++++++++----- .../{ => collections}/ConcurrentHashMapV8.java | 0 .../IntArray.java | 0 .../IntMap.java | 0 .../ObjectIntMap.java | 0 6 files changed, 12 insertions(+), 6 deletions(-) rename Dorkbox-Util/src/dorkbox/util/{ => collections}/ConcurrentHashMapV8.java (100%) rename Dorkbox-Util/src/dorkbox/util/{primativeCollections => collections}/IntArray.java (100%) rename Dorkbox-Util/src/dorkbox/util/{primativeCollections => collections}/IntMap.java (100%) rename Dorkbox-Util/src/dorkbox/util/{primativeCollections => collections}/ObjectIntMap.java (100%) diff --git a/Dorkbox-Util/.classpath b/Dorkbox-Util/.classpath index d12e36d..fb90351 100644 --- a/Dorkbox-Util/.classpath +++ b/Dorkbox-Util/.classpath @@ -22,7 +22,7 @@ - + diff --git a/Dorkbox-Util/LICENSE.TXT b/Dorkbox-Util/LICENSE.TXT index ccb1ef2..7f3709b 100644 --- a/Dorkbox-Util/LICENSE.TXT +++ b/Dorkbox-Util/LICENSE.TXT @@ -88,14 +88,14 @@ Legal: - - FastObjectPool - Apache 2.0 license + - FastObjectPool - Apache 2.0 License http://ashkrit.blogspot.com/2013/05/lock-less-java-object-pool.html https://github.com/ashkrit/blog/tree/master/FastObjectPool Copyright 2013 Ashkrit - - FilenameUtils.java, IOCase.java - Apache 2.0 license + - FilenameUtils.java, IOCase.java - Apache 2.0 License http://commons.apache.org/proper/commons-io/ Copyright 2013 ASF Authors: Kevin A. Burton, Scott Sanders, Daniel Rall, Christoph.Reck, @@ -104,13 +104,19 @@ Legal: - - LAN HostDiscovery from Apache Commons JCS - Apache 2.0 license + - LAN HostDiscovery from Apache Commons JCS - Apache 2.0 License https://issues.apache.org/jira/browse/JCS-40 Copyright 2001-2014 The Apache Software Foundation. - - MathUtils, IntArray, IntMap - Apache 2.0 license + - BinarySearch - MIT License + https://github.com/timboudreau/util + Copyright 2013 Tim Boudreau + + + + - MathUtils, IntArray, IntMap - Apache 2.0 License http://github.com/libgdx/libgdx/ Copyright 2013 Mario Zechner @@ -118,7 +124,7 @@ Legal: - - MersenneTwisterFast, v20 - BSD license + - MersenneTwisterFast, v20 - BSD License http://www.cs.gmu.edu/~sean/research/mersenne/MersenneTwisterFast.java Copyright 2003 by Sean Luke Portions copyright 1993 by Michael Lecuyer diff --git a/Dorkbox-Util/src/dorkbox/util/ConcurrentHashMapV8.java b/Dorkbox-Util/src/dorkbox/util/collections/ConcurrentHashMapV8.java similarity index 100% rename from Dorkbox-Util/src/dorkbox/util/ConcurrentHashMapV8.java rename to Dorkbox-Util/src/dorkbox/util/collections/ConcurrentHashMapV8.java diff --git a/Dorkbox-Util/src/dorkbox/util/primativeCollections/IntArray.java b/Dorkbox-Util/src/dorkbox/util/collections/IntArray.java similarity index 100% rename from Dorkbox-Util/src/dorkbox/util/primativeCollections/IntArray.java rename to Dorkbox-Util/src/dorkbox/util/collections/IntArray.java diff --git a/Dorkbox-Util/src/dorkbox/util/primativeCollections/IntMap.java b/Dorkbox-Util/src/dorkbox/util/collections/IntMap.java similarity index 100% rename from Dorkbox-Util/src/dorkbox/util/primativeCollections/IntMap.java rename to Dorkbox-Util/src/dorkbox/util/collections/IntMap.java diff --git a/Dorkbox-Util/src/dorkbox/util/primativeCollections/ObjectIntMap.java b/Dorkbox-Util/src/dorkbox/util/collections/ObjectIntMap.java similarity index 100% rename from Dorkbox-Util/src/dorkbox/util/primativeCollections/ObjectIntMap.java rename to Dorkbox-Util/src/dorkbox/util/collections/ObjectIntMap.java