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

@@ -244,7 +244,11 @@ public class AsmManager {
}

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) {

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

@@ -59,9 +59,13 @@ public class JDTLikeHandleProvider implements IElementHandleProvider {
String configFile = AsmManager.getDefault().getHierarchy().getConfigFile();
int start = configFile.lastIndexOf(File.separator);
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();
if (parent != null &&

Loading…
Cancel
Save