mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Non-compilable code fixed
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user