Calf cramps after swimming

I have been experiencing cramps and pain in my right calf for a few weeks now which has forced me to cut down my swimming. The problem started when I was lying asleep in bed and took a cramp which was very sore.
Reading this good article has given me a few ideas and I am going to concentrate on drinking more water, having a good breakfast and stretching the muscles.