Bug 2490 fixed

[fil512]

Brent,

Not sure if you saw this post. Still waiting for your feedback before I commit.

Ken

@fil512

Brent,

How about something simple like the following?

	public void mergeState(String newState, String oldState) {
		try {
			SequenceEncoder.Decoder stNew = new SequenceEncoder.Decoder(newState,
					'\t');
			String myNewState = stNew.nextToken();
			String innerNewState = stNew.nextToken();
			SequenceEncoder.Decoder stOld = new SequenceEncoder.Decoder(oldState,
					'\t');
			String myOldState = stOld.nextToken();
			String innerOldState = stOld.nextToken();
			if (!myOldState.equals(myNewState)) {
				mySetState(myNewState);
			}
			if (piece instanceof StateMergeable) {
				((StateMergeable) piece).mergeState(innerNewState, innerOldState);
			}
			else {
				piece.setState(innerNewState);
			}
		} catch (NoSuchElementException e) {
			String message = "Failed to merge ["+newState+"] with [" +oldState+"]";
			throw new NoSuchElementException(message);
		}
	}