CDF results on diffraction from Run I and plans for Run II