Thanks Derik. I didn't know Kepler 2.2 has ptolemy branch (namely ptolemy-kepler-2.2) at kepler svn yet other Kepler versions have ptolemy branch at ptolemy svn.
For Kepler 2.4, I think we will have ptolemy branch at ptolemy svn since Christopher said ptolemy will release a new version around the same time of Kepler 2.4 release, and Kepler 2.4 will use this new ptolemy version. So either change solutions you mentioned for this bug are good for Kepler 2.4.
For future Kepler releases, Ptolemy may or may not have new releases/branches. We can discuss this issue during the next release meeting and hopeful we can make a decision so this code does not need to be updated for every release.
If we decide to have a new Ptolemy branch at Ptolemy svn for each future Kepler release, we'd better use the condition like !PTOLEMY_KEPLER_2_2 &&
startsWith(PTOLEMY_KEPLER). If we will have a new Ptolemy branch at Kepler svn for each future Kepler release, we'd better use the condition like module.getName().equals(Module.PTOLEMY_KEPLER_2_3)) ||
module.getName().equals(Module.PTOLEMY_KEPLER_2_4). By this way, we can minimize the future changes for this class.
With current 4 release starting with Kepler 2.0, only Kepler 2.2 has ptolemy branch (namely ptolemy-kepler-2.2) at kepler svn. I don't know why. I think a better solution is to have a new Ptolemy branch at Ptolemy svn for each future Kepler release.
I checked your changes at 27924 and 27949, and don't think we need further changes except this part.