Until Mr. Koizumi diverted voters ' attention from Japan 's rapidly deteriorating relationship with China , the focus for several months had been trained on the increasing diplomatic , military and economic rivalry with China -- much of it taking place in the waters between the countries , filled with potentially explosive issues like oil and gas and Taiwan .