Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/actions IFormatter.java,1.1,1.2 PyUncomment
Brought to you by:
fabioz
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16235/src/org/python/pydev/editor/actions Modified Files: IFormatter.java PyUncomment.java PyRemoveBlockComment.java PyFormatStd.java PyBackspace.java IOrganizeImports.java PyGoToDefinition.java PyOrganizeImports.java PyAddSingleBlockComment.java PyConvertTabToSpace.java PyConvertSpaceToTab.java PyAddBlockComment.java PyAction.java PyComment.java Removed Files: PySelection.java Log Message: Index: PyRemoveBlockComment.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyRemoveBlockComment.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyRemoveBlockComment.java 12 Apr 2005 16:29:41 -0000 1.3 --- PyRemoveBlockComment.java 25 Feb 2006 00:14:23 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- import org.eclipse.jface.action.IAction; + import org.python.pydev.core.docutils.PySelection; Index: PyConvertTabToSpace.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyConvertTabToSpace.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PyConvertTabToSpace.java 18 Jun 2005 20:17:57 -0000 1.4 --- PyConvertTabToSpace.java 25 Feb 2006 00:14:23 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- import org.eclipse.jface.action.IAction; + import org.python.pydev.core.docutils.PySelection; Index: PyUncomment.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyUncomment.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PyUncomment.java 12 Apr 2005 16:29:41 -0000 1.4 --- PyUncomment.java 25 Feb 2006 00:14:23 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- import org.eclipse.jface.action.IAction; + import org.python.pydev.core.docutils.PySelection; /** Index: PyAddBlockComment.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyAddBlockComment.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PyAddBlockComment.java 1 Aug 2005 16:18:07 -0000 1.11 --- PyAddBlockComment.java 25 Feb 2006 00:14:23 -0000 1.12 *************** *** 11,14 **** --- 11,15 ---- import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.plugin.PydevPrefs; Index: PyGoToDefinition.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyGoToDefinition.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PyGoToDefinition.java 8 Feb 2006 17:58:29 -0000 1.15 --- PyGoToDefinition.java 25 Feb 2006 00:14:23 -0000 1.16 *************** *** 19,22 **** --- 19,23 ---- import org.eclipse.ui.dialogs.ElementListSelectionDialog; import org.python.pydev.core.REF; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.editor.PyEdit; import org.python.pydev.editor.actions.refactoring.PyRefactorAction; Index: PyBackspace.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyBackspace.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PyBackspace.java 14 Sep 2005 16:32:11 -0000 1.8 --- PyBackspace.java 25 Feb 2006 00:14:23 -0000 1.9 *************** *** 10,13 **** --- 10,14 ---- import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextSelection; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.plugin.PydevPrefs; Index: PyAddSingleBlockComment.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyAddSingleBlockComment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PyAddSingleBlockComment.java 1 Aug 2005 16:18:07 -0000 1.1 --- PyAddSingleBlockComment.java 25 Feb 2006 00:14:23 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.plugin.PydevPrefs; Index: PyComment.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyComment.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PyComment.java 12 Apr 2005 16:29:42 -0000 1.5 --- PyComment.java 25 Feb 2006 00:14:23 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- import org.eclipse.jface.action.IAction; + import org.python.pydev.core.docutils.PySelection; /** Index: PyOrganizeImports.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyOrganizeImports.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PyOrganizeImports.java 19 Feb 2006 11:21:13 -0000 1.6 --- PyOrganizeImports.java 25 Feb 2006 00:14:23 -0000 1.7 *************** *** 16,19 **** --- 16,20 ---- import org.eclipse.jface.text.IDocument; import org.python.pydev.core.ExtensionHelper; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.core.docutils.WordUtils; import org.python.pydev.editor.PyEdit; Index: PyFormatStd.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyFormatStd.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PyFormatStd.java 18 Feb 2006 00:02:02 -0000 1.10 --- PyFormatStd.java 25 Feb 2006 00:14:23 -0000 1.11 *************** *** 12,17 **** import org.eclipse.jface.text.TextSelection; import org.python.pydev.core.ExtensionHelper; import org.python.pydev.editor.PyEdit; - import org.python.pydev.parser.visitors.ParsingUtils; import org.python.pydev.plugin.PyCodeFormatterPage; --- 12,18 ---- import org.eclipse.jface.text.TextSelection; import org.python.pydev.core.ExtensionHelper; + import org.python.pydev.core.docutils.ParsingUtils; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.editor.PyEdit; import org.python.pydev.plugin.PyCodeFormatterPage; Index: IOrganizeImports.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/IOrganizeImports.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IOrganizeImports.java 26 Sep 2005 01:25:23 -0000 1.1 --- IOrganizeImports.java 25 Feb 2006 00:14:23 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- package org.python.pydev.editor.actions; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.editor.PyEdit; Index: IFormatter.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/IFormatter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IFormatter.java 18 Feb 2006 00:02:02 -0000 1.1 --- IFormatter.java 25 Feb 2006 00:14:23 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- import org.eclipse.jface.text.IDocument; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.editor.PyEdit; Index: PyConvertSpaceToTab.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyConvertSpaceToTab.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PyConvertSpaceToTab.java 18 Jun 2005 20:17:57 -0000 1.4 --- PyConvertSpaceToTab.java 25 Feb 2006 00:14:23 -0000 1.5 *************** *** 9,12 **** --- 9,13 ---- import org.eclipse.core.runtime.Preferences; import org.eclipse.jface.action.IAction; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.plugin.PydevPrefs; --- PySelection.java DELETED --- Index: PyAction.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyAction.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** PyAction.java 15 Jan 2006 13:45:00 -0000 1.22 --- PyAction.java 25 Feb 2006 00:14:23 -0000 1.23 *************** *** 18,23 **** import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; import org.python.pydev.editor.PyEdit; - import org.python.pydev.parser.visitors.ParsingUtils; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.plugin.PydevPrefs; --- 18,24 ---- import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; + import org.python.pydev.core.docutils.ParsingUtils; + import org.python.pydev.core.docutils.PySelection; import org.python.pydev.editor.PyEdit; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.plugin.PydevPrefs; *************** *** 62,66 **** public static String getDelimiter(IDocument doc){ ! return getDelimiter(doc, 0); } --- 63,67 ---- public static String getDelimiter(IDocument doc){ ! return PySelection.getDelimiter(doc); } *************** *** 73,89 **** */ public static String getDelimiter(IDocument doc, int line){ ! String endLineDelim; ! try { ! if (doc.getNumberOfLines() > 1){ ! endLineDelim = doc.getLineDelimiter(line); ! if (endLineDelim == null) { ! endLineDelim = doc.getLegalLineDelimiters()[0]; ! } ! return endLineDelim; ! } ! } catch (BadLocationException e) { ! PydevPlugin.log(e); ! } ! return System.getProperty("line.separator"); } --- 74,78 ---- */ public static String getDelimiter(IDocument doc, int line){ ! return PySelection.getDelimiter(doc, line); } |