From 4678773c784b97f2c52cbdad5f61159ddcbde559 Mon Sep 17 00:00:00 2001
From: simonbrandhof <simon.brandhof@gmail.com>
Date: Fri, 4 Mar 2011 16:28:28 +0100
Subject: [PATCH] SONAR-2218 improve HTML for IT

---
 .../src/main/java/org/sonar/server/ui/JRubyFacade.java        | 4 ----
 .../src/main/webapp/WEB-INF/app/helpers/application_helper.rb | 3 +--
 .../src/main/webapp/WEB-INF/app/models/sonar/treemap.rb       | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
index d0544c03692..079c1db2edc 100644
--- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
@@ -131,10 +131,6 @@ public final class JRubyFacade implements ServerComponent {
     return getContainer().getComponent(Views.class).getPages(NavigationSection.RESOURCE_TAB, null, null, null);
   }
 
-  public List<ViewProxy<Page>> getResourceTabs(String scope, String qualifier, String language) {
-    return getContainer().getComponent(Views.class).getPages(NavigationSection.RESOURCE_TAB, scope, qualifier, language);
-  }
-
   public ViewProxy<Page> getPage(String id) {
     return getContainer().getComponent(Views.class).getPage(id);
   }
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 53023f55127..c5c63f84d31 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -198,7 +198,6 @@ module ApplicationHelper
   #
   # * <tt>:resource</tt> - id or key of the selected resource
   # * <tt>:highlight</tt> - key of the metric to highlight, different than the metric to drilldown.
-  #  *<tt>:viewer_plugin_key</tt> - the default GWT plugin to be used when clicking on a resource in the drilldown to view it's source
   # * <tt>:period</tt> - period index
   # * <tt>:only_periods</tt> - true if only v
   #
@@ -206,7 +205,7 @@ module ApplicationHelper
   #
   #   url_for_drilldown('ncloc')
   #   url_for_drilldown('ncloc', {:resource => 'org.apache.struts:struts-parent', :highlight => 'lines'})
-  #   url_for_drilldown('ncloc', {:resource => 'org.apache.struts:struts-parent', :viewer_plugin_key => 'org.sonar.plugins.core.violationsviewer.GwtViolationsViewer'})
+  #   url_for_drilldown('ncloc', {:resource => 'org.apache.struts:struts-parent'})
   #
   def url_for_drilldown(metric_or_measure, options={})
     if options[:resource].nil? && !@project
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb
index e7b924b015c..175c65127ca 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/treemap.rb
@@ -76,7 +76,7 @@ class Sonar::Treemap
       "document.location='#{ApplicationController.root_context}/dashboard/index/#{snapshot.project.copy_resource_id || snapshot.project_id}'"
     else
       color_metric_key=(@color_metric ? @color_metric.key : nil)
-      "window.open('#{ApplicationController.root_context}/resource/index/#{snapshot.project_id}?viewer_metric_key=#{color_metric_key}','resource','height=800,width=900,scrollbars=1,resizable=1');return false;"
+      "window.open('#{ApplicationController.root_context}/resource/index/#{snapshot.project_id}?metric=#{color_metric_key}','resource','height=800,width=900,scrollbars=1,resizable=1');return false;"
     end 
   end
     
-- 
2.39.5