提交 89c5fd90 编写于 作者: A Alexander Fedorov

#2556 revert to reduce diff

上级 58a91ae2
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
*/ */
package org.jkiss.dbeaver.ui.editors.sql; package org.jkiss.dbeaver.ui.editors.sql;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
...@@ -30,7 +29,6 @@ import org.eclipse.jface.text.BadLocationException; ...@@ -30,7 +29,6 @@ import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document; import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.source.IAnnotationModel;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.FocusEvent;
...@@ -41,10 +39,8 @@ import org.eclipse.ui.IEditorSite; ...@@ -41,10 +39,8 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.MultiPageEditorSite; import org.eclipse.ui.part.MultiPageEditorSite;
import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel;
import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.core.CoreCommands; import org.jkiss.dbeaver.core.CoreCommands;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.DBeaverUI; import org.jkiss.dbeaver.core.DBeaverUI;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext; import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.exec.compile.DBCCompileLog; import org.jkiss.dbeaver.model.exec.compile.DBCCompileLog;
...@@ -228,14 +224,7 @@ public abstract class SQLEditorNested<T extends DBSObject> ...@@ -228,14 +224,7 @@ public abstract class SQLEditorNested<T extends DBSObject>
public boolean isModifiable(Object element) { public boolean isModifiable(Object element) {
return !SQLEditorNested.this.isReadOnly(); return !SQLEditorNested.this.isReadOnly();
} }
@Override
protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
//FIXME:AF: provide common way to retrieve IResource for remote object
IResource resource = DBeaverCore.getInstance().getProjectManager().getActiveProject();
return new ResourceMarkerAnnotationModel(resource);
}
@Override @Override
protected IDocument createDocument(Object element) throws CoreException { protected IDocument createDocument(Object element) throws CoreException {
final Document document = new Document(); final Document document = new Document();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册