An Integrated Crosscutting Concern Migration Strategy and Its Semi-Automated Application to JHotDraw