Commit Graph

1045 Commits

Author SHA1 Message Date
Deadmoose 71e3d2ca29 Speeling 2011-04-04 22:31:20 -07:00
samskivert cab1a00aac Handle TypeVariable in simpleName().
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2994 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2011-04-02 02:00:45 +00:00
ray.j.greenwell cd0d699c77 - Parse enums.
- Rejigged some strange code in Color parsing.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2993 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2011-03-25 18:47:58 +00:00
andrzej@threerings.net 227a8fa447 Store the class name of the interval so that we can identify it after
cancellation.  It's tempting to store the string representation as
well when the reference is cleared, but that could be anything, so
avoid the expense.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2992 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2011-03-22 22:01:47 +00:00
ray.j.greenwell e02fb89cb0 PECS, and use Collections.reverseOrder().
There are actually 5 different implementations of quicksort in here when
one will do (the array versions could go away and call the list version,
wrapping in Arrays.asList()). But I won't touch those right now. I am
super tempted to reduce things down to one List version and one array
version.

Also it's weird that there are customized Comparators that are null-safe.
I believe I was the one who added them in the past, but I've since learned.
It's a strange undocumented "convenience" when it's easy enough for someone
to provide a null-safe comparator for comparables. (In guava you can call
Ordering.natural().nullsLast()).


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2988 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2011-01-26 20:36:37 +00:00
karma@deadmoose.com a2764d78bb Auld Lang Syne
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2974 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2011-01-01 05:09:33 +00:00
samskivert 939f501ae4 Pass the property key along via the exception.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2973 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-19 19:26:11 +00:00
samskivert 4871bc817f Added requireProperty() and associated MissingPropertyException.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2972 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-19 19:12:10 +00:00
samskivert df7df145e6 Widening.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2971 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-19 18:58:04 +00:00
ray.j.greenwell cb82f080d6 Added ArrayUtil.safeToString(), which encapsulates the logic to check if it's an array.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2970 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-15 01:57:47 +00:00
ray.j.greenwell 059d557ec9 LogBuilder.arrayStr() -> ArrayUtil.toString(), made public.
If Java were invented today, you can be damn sure the array classes
would have reasonable hashCode(), equals(), and toString() implementations,
instead of falling back to Object's.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2969 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-15 01:17:31 +00:00
karma@deadmoose.com b84a696da2 Argh. 1.5 has setIconImage on Frame, not Window.
It's not that it didn't exist, it just used to be on Frame. So when
I did all my 1.5 testing, I was working with a JFrame, and then at the
11th hour decided to make this function take as general a thing as
possible, so I merrily climbed up the tree in 1.6 & didn't notice that
change.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2965 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-02 19:26:46 +00:00
charlie.groves 37e5e05998 Both the List and Image versions of setIconImage were introduced in 1.6, so it's reflection or
nothing.



git-svn-id: https://samskivert.googlecode.com/svn/trunk@2964 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-02 02:33:59 +00:00
karma@deadmoose.com 88628a38f4 Add a helper to set window icons.
As the comments say, it tries to use the nicer stuff that was added in
1.6, but falls back as needed.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2963 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-02 01:22:09 +00:00
karma@deadmoose.com c1dbc51da7 Pretty sure truthiness is never null.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2961 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-01 01:00:57 +00:00
samskivert ebdbd964b5 Do our null checking less wonkily.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2959 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-12-01 00:43:12 +00:00
ray.j.greenwell 6e4739870a You put T in, you get T out.
I'm open to suggestions as to whether this is the right thing.

I think if it were returning a view, we'd definitely want it like this.
You don't want a List<Integer> to look like a List<Number> and have
it break something when someone stuffs a Float in it.

But the argument could be made that returning a new List can surely be
seen as a List<Number> because it is not referenced anywhere else as
something more specific. Many of the guava methods allow a "re-typing"
like this, although I think they have admitted that it was a mistake and
newly added methods don't allow it.

In any case, I think that it's most proper to retain things as specifically
as possible. Why would you turn a List<Integer> into a List<Number>?
Why would you want to throw away the information? If you need to pass it
to a method that expects List<Number> then that method should be modified
to correctly accept List<? extends Number>.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2958 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-11-29 20:35:46 +00:00
ray.j.greenwell 515d5b306e Added a shuffle() that uses our internal random.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2950 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-11-14 23:43:49 +00:00
ray.j.greenwell 7301369760 as(), casts the argument or returns null if it's not an instance of
the specified class.
Yeah.
I've had this laying around for a long time, almost embarrassed by it.
But I keep running into places where it'd be handy, and now I'm
going for it.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2940 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-11-09 00:53:26 +00:00
karma@deadmoose.com 019e5f9311 From Monsieur Thomas. The matcher gets cranky when presented with null.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2939 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-28 21:18:27 +00:00
samskivert e6230497a9 Nixed unused import.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2937 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-25 19:35:08 +00:00
samskivert f8f8057d4f These are now named jjtGetChild instead of getChild, because the former is
clearly more awesome. This is about to precipitate an upgrade from a 10 year
old hacked version of Velocity to a zero year old hacked version of Velocity
which is not going to be pleasant, but is roundabout ten years overdue.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2922 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-15 15:50:53 +00:00
ray.j.greenwell 34f0042956 If we could build upon guava I could make a version of pick() that
took a Function for computing weight. That would be more useful to me, usually.
The Map version could be reimplemented fairly easily with that...


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2921 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-15 02:25:33 +00:00
ray.j.greenwell b77b1c72a6 Formatting.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2920 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-15 02:24:08 +00:00
ray.j.greenwell 57e629dfdb It should be obvious that this will NPE, but I've documented it for the others...
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2919 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-14 20:42:46 +00:00
ray.j.greenwell 003d8819ce Nix getWeighted() and rearrange the Map overload of pick().
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2918 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-13 19:48:05 +00:00
ray.j.greenwell 1f0d6a4a3c Avoid generating a random value for the first weighted entry.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2917 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-13 19:45:51 +00:00
ray.j.greenwell 3dadbe13b9 What was I thinking?: we can't just pick a random number once.
Unsmoke that crack.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2916 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-13 00:12:50 +00:00
ray.j.greenwell 5a8ee16ec5 Dealt with all the TODO's in getWeighted() but in a new override
of pick().
- Iterates once.
- Checks each weight for validity.
- Only generates one random number.

On that last point: huh! I don't think there's anything wrong
with what I've done, and passing a Map with all the values as 1 is
identical to calling the other form of pick on the keySet iterator.
So: maybe I can change the Iterator-based picking and plucking
to only use one random double, like this. In fact, it would make
those methods more optimal in another way: we could stop iteration
as soon as we see the Nth element, where N is (1 / random).

Deprecated getWeighted().
RFC.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2915 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-12 22:59:01 +00:00
ray.j.greenwell 880e785a8a Changed getWeighted() to accept a Map<T, ? extends Number>.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2914 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-12 20:26:02 +00:00
ray.j.greenwell 485e5e160d getNormal() from Mark Johnson.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2913 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-12 01:20:26 +00:00
ray.j.greenwell 4ac0865946 Some javadoc cleanup.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2912 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-06 16:32:02 +00:00
ray.j.greenwell 068aac8e27 A more localized application of @SuppressWarnings is desireable.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2911 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-04 17:13:31 +00:00
ray.j.greenwell 0f7fd4a914 Revert the meat of r2908.
Maybe mdb is using a newer compiler that is behaving correctly,
but my 1.6 freaks out without these.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2910 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 23:15:03 +00:00
ray.j.greenwell f49e205f68 Make this inner class protected, as we're fans of that access level.
Use at your own risk!


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2909 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 23:08:03 +00:00
karma@deadmoose.com 12906728e5 That's already a T, so we don't need to cast it.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2908 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 22:44:46 +00:00
karma@deadmoose.com bf9fd231e0 Flag @Overrides & suppress warnings about those pad members.
I know it's changing code copy & pasted from elsewhere, but 
warnings aren't fun.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2907 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 22:43:46 +00:00
samskivert 808f05322f Actually, let's just pass the level index down to the logger implementation (as
Ray suggested). It's less code and skips the casts entirely.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2906 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 22:13:48 +00:00
samskivert b33c3fcbba We don't want to expose the type parameter just used to pass log level
constants up from the logger impl and back down, so we'll just use Object and
do the casting manually.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2905 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 22:10:14 +00:00
ray.j.greenwell 45b4cb516f Added @ReplaceBy annotation. (The wimpy man's @Deprecated)
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2904 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 00:23:51 +00:00
ray.j.greenwell c917825410 Provide access to Randoms that use a faster thread-local Random.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2903 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-10-01 00:14:39 +00:00
ray.j.greenwell e398039478 Javadoc and header.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2902 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 23:15:59 +00:00
ray.j.greenwell cfa7c9c79b A new replacement for RandomUtil.
- Instead of duplicating every method twice, once allowing you to specify
  your own Random object, there is a static thread-safe sharable instance
  that anyone can use, and a factory method to create your own instance
  with a supplied Random.

- The goofy methods for picking an element from a collection but skipping
  a particular value, or picking from an iterator but providing a count,
  are gone.

- Instead there are two methods: pick and pluck, for picking an element
  or picking and removing an element. For Iterator, only pick is available.
  Optimized code paths are provided for Lists and Collections, but the API
  is kept simple.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2901 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 22:12:56 +00:00
samskivert e88c687229 Import pruning.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2900 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 21:39:56 +00:00
samskivert 1f2a1396ee Ray points out that addAll() and putAll() were already added to CollectionUtil.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2899 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 21:39:31 +00:00
samskivert e8b633abaf Some tests, just for kicks.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2898 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 21:35:55 +00:00
samskivert 8f781ea4cf Oops, missed a spot.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2897 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 21:26:52 +00:00
samskivert 510d31b138 Let's go ahead and add general fold and reduce even though I've held off on
adding a function type to samskivert because everyone and their mother has a
function type. This is hopefully innocuous enough and allows you to obtain
generality at the expense of verbosity:

  Folds.foldLeft(new Folds.R<Integer>() {
    public Integer apply (Integer zero, Integer elem) {
      return Math.max(zero, elem);
    }
  }, 0, values);

  Folds.foldLeft(new Folds.R<String>() {
    public String apply (String zero, String elem) {
      return zero + elem;
    }
  }, "", strings);

Maybe by Java 8 or 9 we'll have closures and this can become:

  Folds.foldLeft((Integer b, Integer a) => Math.max(b, a))
  Folds.foldLeft((String b, String a) => b + a)

or maybe:

  Folds.foldLeft(#(Integer b, Integer a) { return Math.max(b, a); })
  Folds.foldLeft(#(String b, String a) { return b + a; })

who knows where the syntax bike shed arguments will end up. Of course, that'll
probably hit the shelves around 2015 or so at the rate Oracle seems to be
proceeding.

If you really want to get jiggy with the functional programming, you can check
out Functional Java, which goes the whole nine yards, but sort of ignores Java's
standard collections in the process which kind of sucks:

  http://functionaljava.org/


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2896 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 21:26:26 +00:00
samskivert eeed7f2d2e More functional utilities from Mr Greenwell (with some name tweaks by MDB). He
so wants to be using Scala. For example, in Java:

 Folds.sum(0, values)

where values must implement Iterable and all you get is sum. In Scala:

 scala> Array(1, 2, 3).getClass // a real array
 res1: java.lang.Class[_] = class [I

 scala> Array(1, 2, 3).sum     
 res2: Int = 6

 scala> Vector(1, 2, 3).sum // more like ArrayList
 res3: Int = 6

 scala> Map(1 -> 2, 3 -> 4).keysIterator.sum // even works on Iterator
 res4: Int = 4

and you can do arbitrary folds just as easily:

 scala> Array(1, 2, 3).reduceLeft(math.max)
 res5: Int = 3

 scala> Array(2, 3, 4).reduceLeft(_*_)                 
 res6: Int = 24

Want to specify the type of the result? Can do:

 scala> Array(1, 2, 3).foldLeft(0L)(_+_)
 res7: Long = 6

Have a list of maps you need to merge? No problem:

 scala> List(Map(1 -> 2), Map(2 -> 3), Map(3 -> 4)).reduceLeft(_++_)
 res8: scala.collection.immutable.Map[Int,Int] = Map((1,2), (2,3), (3,4))

Functional programming truly does start with fun!


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2895 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 21:02:37 +00:00
samskivert 4c622ea5c8 (From Mr Greenwell) Reduction in size of Logger implementations via some
abstraction, and inlining of LogBuilder code into doLog() so that odd trailing
log arguments can be included without borking our ability to also include a
Throwable as the final argument.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2894 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2010-09-30 20:31:41 +00:00