Automated merge with http://hg.netbeans.org/main/contrib
authorJaroslav Bachorik <yardus@netbeans.org>
Thu, 26 Apr 2012 15:27:11 +0200
changeset 178249a7b2044ac95
parent 17822 e4f9aa73b5b5
parent 17823 12793d932bdb
child 17826 77535f5211c7
Automated merge with http://hg.netbeans.org/main/contrib
     1.1 --- a/autoproject.profiler/src/org/netbeans/modules/autoproject/profiler/AutomaticAntProjectSupportProvider.java	Wed Apr 25 21:55:05 2012 +0200
     1.2 +++ b/autoproject.profiler/src/org/netbeans/modules/autoproject/profiler/AutomaticAntProjectSupportProvider.java	Thu Apr 26 15:27:11 2012 +0200
     1.3 @@ -53,13 +53,6 @@
     1.4   */
     1.5  @ProjectServiceProvider(service=AntProjectSupportProvider.class, projectType="org-netbeans-modules-autoproject") // NOI18N
     1.6  public final class AutomaticAntProjectSupportProvider extends AntProjectSupportProvider {
     1.7 -
     1.8 -    @Override
     1.9 -    public String getProfilerTargetName(FileObject buildScript, int type, FileObject profiledClassFile) {
    1.10 -        // XXX do we need to pay attention to 'type' here?
    1.11 -        return "profile"; // NOI18N
    1.12 -    }
    1.13 -
    1.14      @Override
    1.15      public FileObject getProjectBuildScript() {
    1.16          return FileUtil.toFileObject(InstalledFileLocator.getDefault().locate(