[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor Hyperlink.java,1.6,1.7 PyEdit.java,1.16,1.1
Brought to you by:
fabioz
Menu
▾
▴
[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor Hyperlink.java,1.6,1.7 PyEdit.java,1.16,1.17 PyDocumentProvider.java,1.3,1.4 PyEditConfiguration.java,1.11,1.12
|
From: Aleksandar T. <at...@us...> - 2004-07-02 02:51:17
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18059/src/org/python/pydev/editor Modified Files: Hyperlink.java PyEdit.java PyDocumentProvider.java PyEditConfiguration.java Log Message: 3.0 port Index: PyEditConfiguration.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEditConfiguration.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PyEditConfiguration.java 14 Jun 2004 01:12:30 -0000 1.11 --- PyEditConfiguration.java 2 Jul 2004 02:50:38 -0000 1.12 *************** *** 278,282 **** */ public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { ! final String PY_SINGLELINE_STRING = "__python_singleline_string"; final String PY_MULTILINE_STRING = "__python_multiline_string"; // create a content assistant: --- 278,284 ---- */ public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { ! return null; ! /* ! final String PY_SINGLELINE_STRING = "__python_singleline_string"; final String PY_MULTILINE_STRING = "__python_multiline_string"; // create a content assistant: *************** *** 295,299 **** assistant.setProposalSelectorBackground(bgColor); return assistant; ! } --- 297,301 ---- assistant.setProposalSelectorBackground(bgColor); return assistant; ! */ } Index: PyEdit.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEdit.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PyEdit.java 14 Jun 2004 12:50:10 -0000 1.16 --- PyEdit.java 2 Jul 2004 02:50:38 -0000 1.17 *************** *** 30,33 **** --- 30,34 ---- import org.eclipse.ui.IStorageEditorInput; import org.eclipse.ui.PartInitException; + import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.texteditor.DefaultRangeIndicator; *************** *** 293,301 **** try { filePath = ((IStorageEditorInput)input).getStorage().getFullPath(); ! filePath = ((IPath)filePath).makeAbsolute(); } catch (CoreException e2) { PydevPlugin.log(IStatus.ERROR, "unexpected error getting path", e2); } ! else PydevPlugin.log(IStatus.ERROR, "unexpected type of editor input " + input.getClass().toString(), null); --- 294,306 ---- try { filePath = ((IStorageEditorInput)input).getStorage().getFullPath(); ! filePath = filePath.makeAbsolute(); } catch (CoreException e2) { PydevPlugin.log(IStatus.ERROR, "unexpected error getting path", e2); } ! else if (input instanceof ILocationProvider) { ! filePath = ((ILocationProvider)input).getPath(input); ! filePath = filePath.makeAbsolute(); ! } ! else PydevPlugin.log(IStatus.ERROR, "unexpected type of editor input " + input.getClass().toString(), null); Index: PyDocumentProvider.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyDocumentProvider.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyDocumentProvider.java 12 Mar 2004 00:18:40 -0000 1.3 --- PyDocumentProvider.java 2 Jul 2004 02:50:38 -0000 1.4 *************** *** 7,16 **** --- 7,23 ---- package org.python.pydev.editor; + import java.io.File; + import java.io.FileInputStream; + import java.io.FileNotFoundException; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; + import org.eclipse.core.runtime.IPath; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.text.rules.DefaultPartitioner; + import org.eclipse.ui.IEditorInput; import org.eclipse.ui.editors.text.FileDocumentProvider; + import org.eclipse.ui.editors.text.ILocationProvider; import org.eclipse.ui.part.FileEditorInput; import org.python.pydev.plugin.PythonNature; *************** *** 57,59 **** return partitioner; } ! } \ No newline at end of file --- 64,92 ---- return partitioner; } ! ! ! /** ! * Implementation of Open External File functionality ! */ ! protected boolean setDocumentContent(IDocument document, ! IEditorInput editorInput, String encoding) throws CoreException { ! boolean retVal = super.setDocumentContent(document, editorInput, encoding); ! // Dealing with external files ! if (retVal == false) { ! // for Open External File, we get JavaFile, which we have no access to ! // luckily, this object is also a ILocationProvider ! if (editorInput instanceof ILocationProvider) { ! IPath path = ((ILocationProvider)editorInput).getPath(editorInput); ! path = path.makeAbsolute(); ! File f = path.toFile(); ! try { ! setDocumentContent(document, new FileInputStream(f), encoding); ! } catch (FileNotFoundException e) { ! return false; ! } ! return true; ! } ! } ! return true; ! } ! } Index: Hyperlink.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/Hyperlink.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Hyperlink.java 14 Jun 2004 12:50:10 -0000 1.6 --- Hyperlink.java 2 Jul 2004 02:50:38 -0000 1.7 *************** *** 20,24 **** import org.eclipse.jface.text.ITextInputListener; import org.eclipse.jface.text.ITextViewerExtension2; ! import org.eclipse.jface.text.ITextViewerExtension3; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Region; --- 20,24 ---- import org.eclipse.jface.text.ITextInputListener; import org.eclipse.jface.text.ITextViewerExtension2; ! import org.eclipse.jface.text.ITextViewerExtension5; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Region; *************** *** 237,242 **** // remove underline ! if (viewer instanceof ITextViewerExtension3) { ! ITextViewerExtension3 extension= (ITextViewerExtension3) viewer; offset= extension.modelOffset2WidgetOffset(offset); } else { --- 237,242 ---- // remove underline ! if (viewer instanceof ITextViewerExtension5) { ! ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; offset= extension.modelOffset2WidgetOffset(offset); } else { *************** *** 334,339 **** int widgetOffset= text.getOffsetAtLocation(relativePosition); ! if (viewer instanceof ITextViewerExtension3) { ! ITextViewerExtension3 extension= (ITextViewerExtension3) viewer; return extension.widgetOffset2ModelOffset(widgetOffset); } else { --- 334,339 ---- int widgetOffset= text.getOffsetAtLocation(relativePosition); ! if (viewer instanceof ITextViewerExtension5) { ! ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; return extension.widgetOffset2ModelOffset(widgetOffset); } else { *************** *** 361,366 **** int length= 0; ! if (viewer instanceof ITextViewerExtension3) { ! ITextViewerExtension3 extension= (ITextViewerExtension3) viewer; IRegion widgetRange= extension.modelRange2WidgetRange(region); if (widgetRange == null) --- 361,366 ---- int length= 0; ! if (viewer instanceof ITextViewerExtension5) { ! ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; IRegion widgetRange= extension.modelRange2WidgetRange(region); if (widgetRange == null) *************** *** 634,640 **** int length= 0; ! if (viewer instanceof ITextViewerExtension3) { ! ITextViewerExtension3 extension= (ITextViewerExtension3) viewer; IRegion widgetRange= extension.modelRange2WidgetRange(new Region(offset, length)); if (widgetRange == null) --- 634,640 ---- int length= 0; ! if (viewer instanceof ITextViewerExtension5) { ! ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; IRegion widgetRange= extension.modelRange2WidgetRange(new Region(offset, length)); if (widgetRange == null) |
