1) Fixed calculation of the new indentation method of splitted strings.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / text / JavaCompositeReconcilingStrategy.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaCompositeReconcilingStrategy.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaCompositeReconcilingStrategy.java
index 74ae99f..bdbe486 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaCompositeReconcilingStrategy.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaCompositeReconcilingStrategy.java
@@ -24,122 +24,128 @@ import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 /**
- * Reconciling strategy for Java code. This is a composite strategy containing the regular java model reconciler and the comment
- * spell checking strategy.
+ * Reconciling strategy for Java code. This is a composite strategy containing
+ * the regular java model reconciler and the comment spell checking strategy.
  * 
  * @since 3.0
  */
-public class JavaCompositeReconcilingStrategy extends CompositeReconcilingStrategy {
+public class JavaCompositeReconcilingStrategy extends
+               CompositeReconcilingStrategy {
 
-  private ITextEditor fEditor;
+       private ITextEditor fEditor;
 
-  private JavaReconcilingStrategy fJavaStrategy;
+       private JavaReconcilingStrategy fJavaStrategy;
 
-  /**
-   * Creates a new Java reconciling strategy.
-   * 
-   * @param editor
-   *          the editor of the strategy's reconciler
-   * @param documentPartitioning
-   *          the document partitioning this strategy uses for configuration
-   */
-  public JavaCompositeReconcilingStrategy(ITextEditor editor, String documentPartitioning) {
-    fEditor = editor;
-    fJavaStrategy = new JavaReconcilingStrategy(editor);
-    setReconcilingStrategies(new IReconcilingStrategy[] { fJavaStrategy,
-        new SpellReconcileStrategy(editor, documentPartitioning, PreferenceConstants.getPreferenceStore()) });
-  }
+       /**
+        * Creates a new Java reconciling strategy.
+        * 
+        * @param editor
+        *            the editor of the strategy's reconciler
+        * @param documentPartitioning
+        *            the document partitioning this strategy uses for configuration
+        */
+       public JavaCompositeReconcilingStrategy(ITextEditor editor,
+                       String documentPartitioning) {
+               fEditor = editor;
+               fJavaStrategy = new JavaReconcilingStrategy(editor);
+               setReconcilingStrategies(new IReconcilingStrategy[] {
+                               fJavaStrategy,
+                               new SpellReconcileStrategy(editor, documentPartitioning,
+                                               PreferenceConstants.getPreferenceStore()) });
+       }
 
-  /**
-   * Returns the problem requestor for the editor's input element.
-   * 
-   * @return the problem requestor for the editor's input element
-   */
-  private IProblemRequestorExtension getProblemRequestorExtension() {
-    IDocumentProvider p = fEditor.getDocumentProvider();
-    if (p == null) {
-      try {
-        // work around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=51522
-        p = PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider();
-      } catch (NullPointerException npe) {
-        return null;
-      }
-    }
-    IAnnotationModel m = p.getAnnotationModel(fEditor.getEditorInput());
-    if (m instanceof IProblemRequestorExtension)
-      return (IProblemRequestorExtension) m;
-    return null;
-  }
+       /**
+        * Returns the problem requestor for the editor's input element.
+        * 
+        * @return the problem requestor for the editor's input element
+        */
+       private IProblemRequestorExtension getProblemRequestorExtension() {
+               IDocumentProvider p = fEditor.getDocumentProvider();
+               if (p == null) {
+                       try {
+                               // work around for
+                               // https://bugs.eclipse.org/bugs/show_bug.cgi?id=51522
+                               p = PHPeclipsePlugin.getDefault()
+                                               .getCompilationUnitDocumentProvider();
+                       } catch (NullPointerException npe) {
+                               return null;
+                       }
+               }
+               IAnnotationModel m = p.getAnnotationModel(fEditor.getEditorInput());
+               if (m instanceof IProblemRequestorExtension)
+                       return (IProblemRequestorExtension) m;
+               return null;
+       }
 
-  /*
-   * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion,
-   *      org.eclipse.jface.text.IRegion)
-   */
-  public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
-    IProblemRequestorExtension e = getProblemRequestorExtension();
-    if (e != null) {
-      try {
-        e.beginReportingSequence();
-        super.reconcile(dirtyRegion, subRegion);
-      } finally {
-        e.endReportingSequence();
-      }
-    } else {
-      super.reconcile(dirtyRegion, subRegion);
-    }
-  }
+       /*
+        * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion,
+        *      org.eclipse.jface.text.IRegion)
+        */
+       public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
+               IProblemRequestorExtension e = getProblemRequestorExtension();
+               if (e != null) {
+                       try {
+                               e.beginReportingSequence();
+                               super.reconcile(dirtyRegion, subRegion);
+                       } finally {
+                               e.endReportingSequence();
+                       }
+               } else {
+                       super.reconcile(dirtyRegion, subRegion);
+               }
+       }
 
-  /*
-   * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion)
-   */
-  public void reconcile(IRegion partition) {
-    IProblemRequestorExtension e = getProblemRequestorExtension();
-    if (e != null) {
-      try {
-        e.beginReportingSequence();
-        super.reconcile(partition);
-      } finally {
-        e.endReportingSequence();
-      }
-    } else {
-      super.reconcile(partition);
-    }
-  }
+       /*
+        * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion)
+        */
+       public void reconcile(IRegion partition) {
+               IProblemRequestorExtension e = getProblemRequestorExtension();
+               if (e != null) {
+                       try {
+                               e.beginReportingSequence();
+                               super.reconcile(partition);
+                       } finally {
+                               e.endReportingSequence();
+                       }
+               } else {
+                       super.reconcile(partition);
+               }
+       }
 
-  /**
-   * Tells this strategy whether to inform its listeners.
-   * 
-   * @param notify
-   *          <code>true</code> if listeners should be notified
-   */
-  public void notifyListeners(boolean notify) {
-    fJavaStrategy.notifyListeners(notify);
-  }
+       /**
+        * Tells this strategy whether to inform its listeners.
+        * 
+        * @param notify
+        *            <code>true</code> if listeners should be notified
+        */
+       public void notifyListeners(boolean notify) {
+               fJavaStrategy.notifyListeners(notify);
+       }
 
-  /*
-   * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#initialReconcile()
-   */
-  public void initialReconcile() {
-    IProblemRequestorExtension e = getProblemRequestorExtension();
-    if (e != null) {
-      try {
-        e.beginReportingSequence();
-        super.initialReconcile();
-      } finally {
-        e.endReportingSequence();
-      }
-    } else {
-      super.initialReconcile();
-    }
-  }
+       /*
+        * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#initialReconcile()
+        */
+       public void initialReconcile() {
+               IProblemRequestorExtension e = getProblemRequestorExtension();
+               if (e != null) {
+                       try {
+                               e.beginReportingSequence();
+                               super.initialReconcile();
+                       } finally {
+                               e.endReportingSequence();
+                       }
+               } else {
+                       super.initialReconcile();
+               }
+       }
 
-  /**
-   * Called before reconciling is started.
-   * 
-   * @since 3.0
-   */
-  public void aboutToBeReconciled() {
-    fJavaStrategy.aboutToBeReconciled();
+       /**
+        * Called before reconciling is started.
+        * 
+        * @since 3.0
+        */
+       public void aboutToBeReconciled() {
+               fJavaStrategy.aboutToBeReconciled();
 
-  }
+       }
 }
\ No newline at end of file