Non-compilable code fixed

This commit is contained in:
Olesya Smirnova
2005-02-25 13:39:18 +03:00
parent 121aab36ac
commit 85211e1ffe
2 changed files with 13 additions and 4 deletions
@@ -69,7 +69,11 @@ abstract class SelectInContextImpl implements SelectInContext {
selectInContext = OpenFileDescriptorContext.create(project, ((OpenFileDescriptor)descriptor).getFile());
}
return new SelectInContextProvider(selectInContext, popupLocation);
if (selectInContext == null) {
return null;
} else {
return new SelectInContextProvider(selectInContext, popupLocation);
}
}
private static SelectInContextProvider createEditorContext(DataContext dataContext) {
@@ -371,10 +371,15 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
UpToDateRevisionProvider upToDateRevisionProvider = activeVcs.getUpToDateRevisionProvider();
if (upToDateRevisionProvider == null) return;
String lastUpToDateContent = upToDateRevisionProvider.getLastUpToDateContentFor(virtualFile);
if (lastUpToDateContent == null) return;
try {
String lastUpToDateContent = upToDateRevisionProvider.getLastUpToDateContentFor(virtualFile);
if (lastUpToDateContent == null) return;
setUpToDateContent(document, lastUpToDateContent);
setUpToDateContent(document, lastUpToDateContent);
}
catch (VcsException e) {
//ignore
}
}
public boolean checkVcsIsActive(AbstractVcs vcs) {