[E-p-i-c-commits] org.epic.perleditor/src/org/epic/perleditor/editors PerlContentOutlinePage.java,1.1.1.1,1.2 PerlSourceViewerConfiguration.java,1.2,1.3

[<sko...@us...>]

Update of /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/editors
In directory sc8-pr-cvs1:/tmp/cvs-serv16909/src/org/epic/perleditor/editors

Modified Files:
	PerlContentOutlinePage.java PerlSourceViewerConfiguration.java 
Log Message:


Index: PerlContentOutlinePage.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/editors/PerlContentOutlinePage.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- PerlContentOutlinePage.java	10 May 2003 12:43:23 -0000	1.1.1.1
+++ PerlContentOutlinePage.java	6 Sep 2003 20:26:14 -0000	1.2
@@ -50,7 +50,7 @@
 		public String toString() {
 			return name;
 		}
-	};
+	}
 
 	/**
 	 * Divides the editor's document into ten segments and provides elements for them.
@@ -64,6 +64,9 @@
 		protected void parse(IDocument document) {
 
 			int lines= document.getNumberOfLines();
+            //TODO this line is broken
+            //the float-cast does nothing. i guess the author wanted to write
+            //  Math.max(Math.round(lines/10f), 10)
 			int increment= Math.max(Math.round((float) (lines / 10)), 10);
 
 			for (int line= 0; line < lines; line += increment) {
@@ -163,7 +166,7 @@
 				return fContent.toArray();
 			return new Object[0];
 		}
-	};
+	}
 
 	protected Object fInput;
 	protected IDocumentProvider fDocumentProvider;

Index: PerlSourceViewerConfiguration.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.perleditor/src/org/epic/perleditor/editors/PerlSourceViewerConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PerlSourceViewerConfiguration.java	20 May 2003 14:58:01 -0000	1.2
+++ PerlSourceViewerConfiguration.java	6 Sep 2003 20:26:14 -0000	1.3
@@ -1,157 +1,157 @@
-package org.epic.perleditor.editors;
-
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.jface.text.DefaultAutoIndentStrategy;
-import org.eclipse.jface.text.IAutoIndentStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.epic.perleditor.editors.perl.PerlAutoIndentStrategy;
-import org.epic.perleditor.editors.perl.PerlCompletionProcessor;
-import org.epic.perleditor.editors.perl.PerlDoubleClickSelector;
-import org.eclipse.ui.editors.text.TextEditor;
-
-import org.epic.perleditor.editors.util.PerlColorProvider;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.epic.perleditor.preferences.PreferenceConstants;
-
-import cbg.editor.*;
-import cbg.editor.rules.*;
-
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * @author luelljoc
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class PerlSourceViewerConfiguration
-   
-	//extends SourceViewerConfiguration {
-	extends ColoringSourceViewerConfiguration {
-		IPreferenceStore fStore;
-		TextEditor fTextEditor;
-		
-		/**
-				 * Single token scanner.
-				 */
-
-				static class SingleTokenScanner extends BufferedRuleBasedScanner {
-					public SingleTokenScanner(TextAttribute attribute) {
-						setDefaultReturnToken(new Token(attribute));
-					}
-				};
-				
-				
-				
-	protected void adaptToPreferenceChange(PropertyChangeEvent event) {
-		super.adaptToPreferenceChange(event);
-	}
-	/**
-	 * 
-	 */
-	public PerlSourceViewerConfiguration(IPreferenceStore store, TextEditor textEditor){
-		super(new ColorManager(store), EditorPlugin.getDefault().getEditorTools());
-		
-		setMode(Modes.getMode("perl.xml"));
-	/*	
-		String filename;
-		
-		// If we can't get the filname use default name
-		try {
-		   filename = textEditor.getEditorInput().getName();
-		} catch(Exception e) {
-			filename = "input.pl";
-		}
-
-		setFilename(filename);
-*/
-		fStore = store;
-		fTextEditor = textEditor;
-	}
-	
-	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
-			return new PerlAnnotationHover();
-		}
-
-	
-		/* 
-		 * Method declared on SourceViewerConfiguration
-		 */
-		public IAutoIndentStrategy getAutoIndentStrategy(ISourceViewer sourceViewer, String contentType) {
-			return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? new PerlAutoIndentStrategy() : new DefaultAutoIndentStrategy());
-		}
-	
-		/* 
-		 * Method declared on SourceViewerConfiguration
-		 */
-		 /*
-		public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-			return new String[] { IDocument.DEFAULT_CONTENT_TYPE, PerlPartitionScanner.PERL_MULTI_LINE_COMMENT };
-		}
-		*/
-	
-		/* 
-		 * Method declared on SourceViewerConfiguration
-		 */
-		public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-
-			ContentAssistant assistant= new ContentAssistant();
-			assistant.setContentAssistProcessor(new PerlCompletionProcessor(fTextEditor), IDocument.DEFAULT_CONTENT_TYPE);
-			assistant.enableAutoActivation(true);
-			assistant.setAutoActivationDelay(500);
-			assistant.setProposalPopupOrientation(ContentAssistant.PROPOSAL_OVERLAY);
-			assistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE);
-			assistant.setContextInformationPopupBackground(PerlColorProvider.getColor(new RGB(150, 150, 0)));
-			assistant.setProposalSelectorBackground(PerlColorProvider.getColor(new RGB(254, 241, 233)));
-  
-			return assistant;
-		}
-	
-		/* 
-		 * Method declared on SourceViewerConfiguration
-		 */
-		 /*
-		public String getDefaultPrefix(ISourceViewer sourceViewer, String contentType) {
-			return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? "//" : null); //$NON-NLS-1$
-		
-		}
-	*/
-		/* 
-		 * Method declared on SourceViewerConfiguration
-		 */
-		public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
-			return new PerlDoubleClickSelector();
-		}
-	
-		/* 
-		 * Method declared on SourceViewerConfiguration
-		 */
-		public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
-			return new String[] { "\t", "    " }; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		/* 
-			 * Method declared on SourceViewerConfiguration
-			 */
-			public int getTabWidth(ISourceViewer sourceViewer) {
-				//return 4;
-				return fStore.getInt(PreferenceConstants.EDITOR_TAB_WIDTH);
-			}
-	
-			/* 
-			 * Method declared on SourceViewerConfiguration
-			 */
-			public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
-				return new PerlTextHover();
-			}
-}
+package org.epic.perleditor.editors;
+
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.jface.text.DefaultAutoIndentStrategy;
+import org.eclipse.jface.text.IAutoIndentStrategy;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextDoubleClickStrategy;
+import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.IContentAssistant;
+import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.source.IAnnotationHover;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.epic.perleditor.editors.perl.PerlAutoIndentStrategy;
+import org.epic.perleditor.editors.perl.PerlCompletionProcessor;
+import org.epic.perleditor.editors.perl.PerlDoubleClickSelector;
+import org.eclipse.ui.editors.text.TextEditor;
+
+import org.epic.perleditor.editors.util.PerlColorProvider;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.epic.perleditor.preferences.PreferenceConstants;
+
+import cbg.editor.*;
+import cbg.editor.rules.*;
+
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+/**
+ * @author luelljoc
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class PerlSourceViewerConfiguration
+   
+	//extends SourceViewerConfiguration {
+	extends ColoringSourceViewerConfiguration {
+		IPreferenceStore fStore;
+		TextEditor fTextEditor;
+		
+		/**
+				 * Single token scanner.
+				 */
+
+				static class SingleTokenScanner extends BufferedRuleBasedScanner {
+					public SingleTokenScanner(TextAttribute attribute) {
+						setDefaultReturnToken(new Token(attribute));
+					}
+				}
+				
+				
+				
+	protected void adaptToPreferenceChange(PropertyChangeEvent event) {
+		super.adaptToPreferenceChange(event);
+	}
+	/**
+	 * 
+	 */
+	public PerlSourceViewerConfiguration(IPreferenceStore store, TextEditor textEditor){
+		super(new ColorManager(store), EditorPlugin.getDefault().getEditorTools());
+		
+		setMode(Modes.getMode("perl.xml"));
+	/*	
+		String filename;
+		
+		// If we can't get the filname use default name
+		try {
+		   filename = textEditor.getEditorInput().getName();
+		} catch(Exception e) {
+			filename = "input.pl";
+		}
+
+		setFilename(filename);
+*/
+		fStore = store;
+		fTextEditor = textEditor;
+	}
+	
+	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+			return new PerlAnnotationHover();
+		}
+
+	
+		/* 
+		 * Method declared on SourceViewerConfiguration
+		 */
+		public IAutoIndentStrategy getAutoIndentStrategy(ISourceViewer sourceViewer, String contentType) {
+			return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? new PerlAutoIndentStrategy() : new DefaultAutoIndentStrategy());
+		}
+	
+		/* 
+		 * Method declared on SourceViewerConfiguration
+		 */
+		 /*
+		public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+			return new String[] { IDocument.DEFAULT_CONTENT_TYPE, PerlPartitionScanner.PERL_MULTI_LINE_COMMENT };
+		}
+		*/
+	
+		/* 
+		 * Method declared on SourceViewerConfiguration
+		 */
+		public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
+
+			ContentAssistant assistant= new ContentAssistant();
+			assistant.setContentAssistProcessor(new PerlCompletionProcessor(fTextEditor), IDocument.DEFAULT_CONTENT_TYPE);
+			assistant.enableAutoActivation(true);
+			assistant.setAutoActivationDelay(500);
+			assistant.setProposalPopupOrientation(ContentAssistant.PROPOSAL_OVERLAY);
+			assistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE);
+			assistant.setContextInformationPopupBackground(PerlColorProvider.getColor(new RGB(150, 150, 0)));
+			assistant.setProposalSelectorBackground(PerlColorProvider.getColor(new RGB(254, 241, 233)));
+  
+			return assistant;
+		}
+	
+		/* 
+		 * Method declared on SourceViewerConfiguration
+		 */
+		 /*
+		public String getDefaultPrefix(ISourceViewer sourceViewer, String contentType) {
+			return (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? "//" : null); //$NON-NLS-1$
+		
+		}
+	*/
+		/* 
+		 * Method declared on SourceViewerConfiguration
+		 */
+		public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
+			return new PerlDoubleClickSelector();
+		}
+	
+		/* 
+		 * Method declared on SourceViewerConfiguration
+		 */
+		public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
+			return new String[] { "\t", "    " }; //$NON-NLS-1$ //$NON-NLS-2$
+		}
+
+		/* 
+			 * Method declared on SourceViewerConfiguration
+			 */
+			public int getTabWidth(ISourceViewer sourceViewer) {
+				//return 4;
+				return fStore.getInt(PreferenceConstants.EDITOR_TAB_WIDTH);
+			}
+	
+			/* 
+			 * Method declared on SourceViewerConfiguration
+			 */
+			public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
+				return new PerlTextHover();
+			}
+}