php formatter based on the JDT java formatter (very early version)

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java
index 249dbec..ca6331d 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ToolFactory.java
@@ -16,7 +16,7 @@ import java.util.Map;
 import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.runtime.Plugin;
-import org.phpeclipse.phpdt.internal.formatter.CodeFormatter;
+import net.sourceforge.phpdt.internal.formatter.CodeFormatter;
 
 /**
  * Factory for creating various compiler tools, such as scanners, parsers and compilers.

diff --git a/net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/CodeFormatter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
similarity index 99%
rename from net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/CodeFormatter.java
rename to net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
index 0366a03..13bbf68 100644 (file)
--- a/net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/CodeFormatter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.phpeclipse.phpdt.internal.formatter;
+package net.sourceforge.phpdt.internal.formatter;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -24,8 +24,8 @@ import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.ConfigurableOption;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 
-import org.phpeclipse.phpdt.internal.formatter.impl.FormatterOptions;
-import org.phpeclipse.phpdt.internal.formatter.impl.SplitLine;
+import net.sourceforge.phpdt.internal.formatter.impl.FormatterOptions;
+import net.sourceforge.phpdt.internal.formatter.impl.SplitLine;
 
 /** <h2>How to format a piece of code ?</h2>
  * <ul><li>Create an instance of <code>CodeFormatter</code>

diff --git a/net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/Options.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/Options.properties
similarity index 100%
rename from net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/Options.properties
rename to net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/Options.properties

diff --git a/net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/impl/FormatterOptions.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/FormatterOptions.java
similarity index 98%
rename from net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/impl/FormatterOptions.java
rename to net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/FormatterOptions.java
index a10281f..5684b81 100644 (file)
--- a/net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/impl/FormatterOptions.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/FormatterOptions.java
@@ -8,11 +8,13 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.phpeclipse.phpdt.internal.formatter.impl;
-\rimport java.util.Map;
+package net.sourceforge.phpdt.internal.formatter.impl;
+
+import java.util.Map;
 
 public class FormatterOptions {        
-\r      /**
+
+       /**
         * Option IDs
         */
        public static final String OPTION_InsertNewlineBeforeOpeningBrace = "org.phpeclipse.phpdt.core.formatter.newline.openingBrace"; //$NON-NLS-1$

diff --git a/net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/impl/SplitLine.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/SplitLine.java
similarity index 99%
rename from net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/impl/SplitLine.java
rename to net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/SplitLine.java
index 275baf0..b17a73d 100644 (file)
--- a/net.sourceforge.phpeclipse/src/org/phpeclipse/phpdt/internal/formatter/impl/SplitLine.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/SplitLine.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
-package org.phpeclipse.phpdt.internal.formatter.impl;
+package net.sourceforge.phpdt.internal.formatter.impl;
 
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;