Browse Source

patches from 148190 #22

tags/Root_extensions
aclement 17 years ago
parent
commit
41fefd58f8

+ 5
- 1
asm/src/org/aspectj/asm/AsmManager.java View File

} }


private String genExternFilePath(String configFilePath) { private String genExternFilePath(String configFilePath) {
return configFilePath.substring(0, configFilePath.lastIndexOf(".lst")) + ".ajsym";
// sometimes don't have ".lst"
if (configFilePath.lastIndexOf(".lst") != -1) {
configFilePath = configFilePath.substring(0,configFilePath.lastIndexOf(".lst"));
}
return configFilePath + ".ajsym";
} }
// public void setShouldSaveModel(boolean shouldSaveModel) { // public void setShouldSaveModel(boolean shouldSaveModel) {

+ 7
- 3
asm/src/org/aspectj/asm/internal/JDTLikeHandleProvider.java View File

String configFile = AsmManager.getDefault().getHierarchy().getConfigFile(); String configFile = AsmManager.getDefault().getHierarchy().getConfigFile();
int start = configFile.lastIndexOf(File.separator); int start = configFile.lastIndexOf(File.separator);
int end = configFile.lastIndexOf(".lst"); int end = configFile.lastIndexOf(".lst");
String fileName = configFile.substring(start + 1,end);
ipe.setHandleIdentifier(fileName);
return fileName;
if (end != -1) {
configFile = configFile.substring(start+1,end);
} else {
configFile = configFile.substring(start+1);
}
ipe.setHandleIdentifier(configFile);
return configFile;
} }
IProgramElement parent = ipe.getParent(); IProgramElement parent = ipe.getParent();
if (parent != null && if (parent != null &&

Loading…
Cancel
Save