Automated merge with http://hg.netbeans.org/main/contrib
authorMartin Fousek <marfous@netbeans.org>
Fri, 02 Jul 2010 13:37:35 +0200
changeset 16345bb5967155acb
parent 16343 f5bc50e48ce3
parent 16344 a76b482b2bf0
child 16346 75928988507b
Automated merge with http://hg.netbeans.org/main/contrib
     1.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/SmartyPhpFrameworkProvider.java	Fri Jul 02 13:43:23 2010 +0400
     1.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/SmartyPhpFrameworkProvider.java	Fri Jul 02 13:37:35 2010 +0200
     1.3 @@ -39,19 +39,8 @@
     1.4  package org.netbeans.modules.php.smarty;
     1.5  
     1.6  import java.io.File;
     1.7 -import java.util.Collections;
     1.8 -import java.util.Set;
     1.9 -import org.netbeans.modules.parsing.api.ParserManager;
    1.10 -import org.netbeans.modules.parsing.api.ResultIterator;
    1.11 -import org.netbeans.modules.parsing.api.Source;
    1.12 -import org.netbeans.modules.parsing.api.UserTask;
    1.13 -import org.netbeans.modules.parsing.spi.ParseException;
    1.14  import org.netbeans.modules.php.api.phpmodule.PhpModule;
    1.15  import org.netbeans.modules.php.api.phpmodule.PhpModuleProperties;
    1.16 -import org.netbeans.modules.php.editor.api.ElementQuery.Index;
    1.17 -import org.netbeans.modules.php.editor.api.ElementQueryFactory;
    1.18 -import org.netbeans.modules.php.editor.api.QuerySupportFactory;
    1.19 -import org.netbeans.modules.php.editor.parser.PHPParseResult;
    1.20  import org.netbeans.modules.php.editor.parser.astnodes.ClassInstanceCreation;
    1.21  import org.netbeans.modules.php.editor.parser.astnodes.NamespaceName;
    1.22  import org.netbeans.modules.php.editor.parser.astnodes.visitors.DefaultVisitor;
    1.23 @@ -65,9 +54,7 @@
    1.24  import org.netbeans.modules.php.spi.phpmodule.PhpModuleIgnoredFilesExtender;
    1.25  import org.openide.filesystems.FileObject;
    1.26  import org.openide.filesystems.FileUtil;
    1.27 -import org.openide.util.Exceptions;
    1.28  import org.openide.util.NbBundle;
    1.29 -import org.openide.util.RequestProcessor;
    1.30  
    1.31  /**
    1.32   * @author Martin Fousek
    1.33 @@ -147,7 +134,7 @@
    1.34  
    1.35      @Override
    1.36      public File[] getConfigurationFiles(PhpModule phpModule) {
    1.37 -        return null;
    1.38 +        return new File[0];
    1.39      }
    1.40  
    1.41      @Override