I highly doubt it.  As tuasfait pointed out, the history shared by the two countries is ugly, but a Cold-War-like situation is highly unlikely.  For one thing, China's the only country with nukes in that faceoff.  Any kind of war between Japan and China could not end in anything but an incredible defeat for Japan.  its standing army alone is enough to convince me of that.

I'd like to think we're moving beyond those sorts of confrontations, but, then again, I'm an American, and my government is the one that always seems to enjoy proving me wrong.

Be nice to America. Or we'll bring democracy to your country.