csseditor-cvs

[Christopher L. <ce...@us...>]

Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6750/src/net/sourceforge/csseditor/internal/text

Modified Files:
	CssReconcilingStrategy.java 
Log Message:
Fixes for Eclipse 3.0

Index: CssReconcilingStrategy.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text/CssReconcilingStrategy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssReconcilingStrategy.java	27 Dec 2003 14:33:09 -0000	1.2
--- CssReconcilingStrategy.java	25 Jun 2004 09:51:21 -0000	1.3
***************
*** 23,27 ****
  import org.eclipse.jface.text.Position;
  import org.eclipse.jface.text.reconciler.DirtyRegion;
- import org.eclipse.jface.text.reconciler.DocumentAdapter;
  import org.eclipse.jface.text.reconciler.IReconcileResult;
  import org.eclipse.jface.text.reconciler.IReconcileStep;
--- 23,26 ----
***************
*** 62,66 ****
      public CssReconcilingStrategy(ITextEditor editor) {
          this.editor = editor;
!         this.firstStep = new CssReconcileStep(this.editor);
      }
  
--- 61,65 ----
      public CssReconcilingStrategy(ITextEditor editor) {
          this.editor = editor;
!         firstStep = new CssReconcileStep(editor);
      }
  
***************
*** 72,76 ****
      public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
          removeTemporaryAnnotations();
!         process(this.firstStep.reconcile(dirtyRegion, subRegion));
      }
  
--- 71,75 ----
      public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
          removeTemporaryAnnotations();
!         process(firstStep.reconcile(dirtyRegion, subRegion));
      }
  
***************
*** 80,84 ****
      public void reconcile(IRegion partition) {
          removeTemporaryAnnotations();
!         process(this.firstStep.reconcile(partition));
      }
  
--- 79,83 ----
      public void reconcile(IRegion partition) {
          removeTemporaryAnnotations();
!         process(firstStep.reconcile(partition));
      }
  
***************
*** 87,91 ****
       */
      public void setDocument(IDocument document) {
!         this.firstStep.setInputModel(new DocumentAdapter(document));
      }
  
--- 86,91 ----
       */
      public void setDocument(IDocument document) {
!         // TODO firstStep.setInputModel(new DocumentAdapter(document));
!         firstStep.setInputModel(null);
      }
  
***************
*** 96,100 ****
       */
      public void initialReconcile() {
!         this.firstStep.reconcile(null);
      }
  
--- 96,100 ----
       */
      public void initialReconcile() {
!         process(firstStep.reconcile(null));
      }
  
***************
*** 103,108 ****
       */
      public void setProgressMonitor(IProgressMonitor monitor) {
!         this.firstStep.setProgressMonitor(monitor);
!         this.progressMonitor = monitor;
      }
  
--- 103,108 ----
       */
      public void setProgressMonitor(IProgressMonitor monitor) {
!         firstStep.setProgressMonitor(monitor);
!         progressMonitor = monitor;
      }
  
***************
*** 115,120 ****
       */
      private IAnnotationModel getAnnotationModel()  {
!         IEditorInput input = this.editor.getEditorInput();
!         return this.editor.getDocumentProvider().getAnnotationModel(input);
      }
  
--- 115,120 ----
       */
      private IAnnotationModel getAnnotationModel()  {
!         IEditorInput input = editor.getEditorInput();
!         return editor.getDocumentProvider().getAnnotationModel(input);
      }
  
***************
*** 129,134 ****
              protected void execute(IProgressMonitor monitor) {
                  for (int i = 0; i < results.length; i++) {               
!                     if ((CssReconcilingStrategy.this.progressMonitor != null)
!                      && (CssReconcilingStrategy.this.progressMonitor.isCanceled())) {
                          return;
                      }
--- 129,134 ----
              protected void execute(IProgressMonitor monitor) {
                  for (int i = 0; i < results.length; i++) {               
!                     if ((progressMonitor != null)
!                      && (progressMonitor.isCanceled())) {
                          return;
                      }