Fixed bug in CodeFormatter; for partial formatting select complete <?php ... ?> range

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaFormattingStrategy.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaFormattingStrategy.java
index 264938e..56ba202 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaFormattingStrategy.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaFormattingStrategy.java
@@ -1,6 +1,5 @@
 /*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
+ * (c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.
  */
 package net.sourceforge.phpdt.internal.ui.text.java;
 
@@ -15,40 +14,44 @@ import org.eclipse.jface.text.formatter.IFormattingStrategy;
 import org.eclipse.jface.text.source.ISourceViewer;
 
 public class JavaFormattingStrategy implements IFormattingStrategy {
-       
-       private String fInitialIndentation;
-       private ISourceViewer fViewer;  
-
-       public JavaFormattingStrategy(ISourceViewer viewer) {
-               fViewer = viewer;
-       }
-       
-       /**
-        * @see IFormattingStrategy#formatterStarts(String)
-        */
-       public void formatterStarts(String initialIndentation) {
-               fInitialIndentation= initialIndentation;
-       }
-       
-       /**
-        * @see IFormattingStrategy#formatterStops()
-        */
-       public void formatterStops() {
-       }
-       
-       /**
-        * @see IFormattingStrategy#format(String, boolean, String, int[])
-        */
-       public String format(String content, boolean isLineStart, String indentation, int[] positions) {
-               ICodeFormatter formatter= ToolFactory.createCodeFormatter();
-               
-               IDocument doc= fViewer.getDocument();
-               String lineDelimiter= StubUtility.getLineDelimiterFor(doc);
-
-               int indent= 0;
-               if (fInitialIndentation != null) {
-                       indent= Strings.computeIndent(fInitialIndentation, CodeFormatterPreferencePage.getTabSize());
-               }
-               return formatter.format(content, indent, positions, lineDelimiter);
-       }       
+
+  private String fInitialIndentation;
+
+  private ISourceViewer fViewer;
+
+  public JavaFormattingStrategy(ISourceViewer viewer) {
+    fViewer = viewer;
+  }
+
+  /**
+   * @see IFormattingStrategy#formatterStarts(String)
+   */
+  public void formatterStarts(String initialIndentation) {
+    fInitialIndentation = initialIndentation;
+  }
+
+  /**
+   * @see IFormattingStrategy#formatterStops()
+   */
+  public void formatterStops() {
+  }
+
+  /**
+   * @see IFormattingStrategy#format(String, boolean, String, int[])
+   */
+  public String format(String content, boolean isLineStart, String indentation,
+      int[] positions) {
+    ICodeFormatter formatter = ToolFactory.createCodeFormatter();
+
+    IDocument doc = fViewer.getDocument();
+    String lineDelimiter = StubUtility.getLineDelimiterFor(doc);
+
+    int indent = 0;
+    if (fInitialIndentation != null) {
+      indent = Strings.computeIndent(fInitialIndentation,
+          CodeFormatterPreferencePage.getTabSize());
+    }
+
+    return formatter.format(content, indent, positions, lineDelimiter);
+  }
 }
\ No newline at end of file