Automated merge with http://hg.netbeans.org/main/contrib
authorMarek Fukala <mfukala@netbeans.org>
Wed, 27 Jul 2011 16:19:09 +0200
changeset 17540a7f5a017541d
parent 17536 1107edd1766f
parent 17539 a4c80904ef0c
child 17544 043f8525c982
child 17547 8df1f618f1d3
Automated merge with http://hg.netbeans.org/main/contrib
     1.1 --- a/php.smarty/nbproject/project.xml	Thu Jul 21 13:00:56 2011 -0400
     1.2 +++ b/php.smarty/nbproject/project.xml	Wed Jul 27 16:19:09 2011 +0200
     1.3 @@ -24,15 +24,6 @@
     1.4                      </run-dependency>
     1.5                  </dependency>
     1.6                  <dependency>
     1.7 -                    <code-name-base>org.netbeans.modules.css.editor</code-name-base>
     1.8 -                    <build-prerequisite/>
     1.9 -                    <compile-dependency/>
    1.10 -                    <run-dependency>
    1.11 -                        <release-version>1</release-version>
    1.12 -                        <specification-version>1.17</specification-version>
    1.13 -                    </run-dependency>
    1.14 -                </dependency>
    1.15 -                <dependency>
    1.16                      <code-name-base>org.netbeans.modules.editor</code-name-base>
    1.17                      <build-prerequisite/>
    1.18                      <compile-dependency/>
    1.19 @@ -175,6 +166,14 @@
    1.20                      </run-dependency>
    1.21                  </dependency>
    1.22                  <dependency>
    1.23 +                    <code-name-base>org.netbeans.modules.web.indent</code-name-base>
    1.24 +                    <build-prerequisite/>
    1.25 +                    <compile-dependency/>
    1.26 +                    <run-dependency>
    1.27 +                        <specification-version>1.0</specification-version>
    1.28 +                    </run-dependency>
    1.29 +                </dependency>
    1.30 +                <dependency>
    1.31                      <code-name-base>org.netbeans.spi.palette</code-name-base>
    1.32                      <build-prerequisite/>
    1.33                      <compile-dependency/>
     2.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/editor/indent/TplIndenter.java	Thu Jul 21 13:00:56 2011 -0400
     2.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/editor/indent/TplIndenter.java	Wed Jul 27 16:19:09 2011 +0200
     2.3 @@ -52,14 +52,14 @@
     2.4  import org.netbeans.api.lexer.TokenId;
     2.5  import org.netbeans.api.lexer.TokenSequence;
     2.6  import org.netbeans.editor.Utilities;
     2.7 -import org.netbeans.modules.css.formatting.api.support.AbstractIndenter;
     2.8 -import org.netbeans.modules.css.formatting.api.support.IndenterContextData;
     2.9 -import org.netbeans.modules.css.formatting.api.support.IndentCommand;
    2.10 -import org.netbeans.modules.css.formatting.api.embedding.JoinedTokenSequence;
    2.11 -import org.netbeans.modules.css.formatting.api.LexUtilities;
    2.12  import org.netbeans.modules.editor.indent.spi.Context;
    2.13  import org.netbeans.modules.php.smarty.editor.lexer.TplTokenId;
    2.14  import org.netbeans.modules.php.smarty.editor.lexer.TplTopTokenId;
    2.15 +import org.netbeans.modules.web.indent.api.LexUtilities;
    2.16 +import org.netbeans.modules.web.indent.api.embedding.JoinedTokenSequence;
    2.17 +import org.netbeans.modules.web.indent.api.support.AbstractIndenter;
    2.18 +import org.netbeans.modules.web.indent.api.support.IndentCommand;
    2.19 +import org.netbeans.modules.web.indent.api.support.IndenterContextData;
    2.20  
    2.21  /**
    2.22   * @author Martin Fousek