Japan and China have been in a long-running dispute over the Senkaku islands that Beijing calls the Diaoyu.