An Integrated Crosscutting Concern Migration Strategy and its Application to JHoTDraw