diff options
7 files changed, 12 insertions, 13 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java index a695539aa2f..c5530ef2cbb 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java @@ -41,8 +41,8 @@ import org.sonar.plugins.core.dashboards.ProjectDefaultDashboard; import org.sonar.plugins.core.dashboards.ProjectHotspotDashboard; import org.sonar.plugins.core.dashboards.ProjectReviewsDashboard; import org.sonar.plugins.core.dashboards.ProjectTimeMachineDashboard; -import org.sonar.plugins.core.filters.MyFavouritesFilter; -import org.sonar.plugins.core.filters.ProjectFilter; +import org.sonar.plugins.core.measurefilters.MyFavouritesFilter; +import org.sonar.plugins.core.measurefilters.ProjectFilter; import org.sonar.plugins.core.security.ApplyProjectRolesDecorator; import org.sonar.plugins.core.sensors.BranchCoverageDecorator; import org.sonar.plugins.core.sensors.CheckAlertThresholds; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java index c0719a2c898..11ef29b2474 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboard.java @@ -24,8 +24,8 @@ import org.sonar.api.web.DashboardLayout; import org.sonar.api.web.DashboardTemplate; import org.sonar.core.measure.MeasureFilterDao; import org.sonar.core.measure.MeasureFilterDto; -import org.sonar.plugins.core.filters.MyFavouritesFilter; -import org.sonar.plugins.core.filters.ProjectFilter; +import org.sonar.plugins.core.measurefilters.MyFavouritesFilter; +import org.sonar.plugins.core.measurefilters.ProjectFilter; import org.sonar.plugins.core.widgets.MeasureFilterListWidget; import org.sonar.plugins.core.widgets.MeasureFilterTreemapWidget; import org.sonar.plugins.core.widgets.WelcomeWidget; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/MyFavouritesFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java index ea66def1484..ef7e17c146e 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/MyFavouritesFilter.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.core.filters; +package org.sonar.plugins.core.measurefilters; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.web.Filter; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/ProjectFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java index 50f387f7bf0..c8f0173cbd1 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/ProjectFilter.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.core.filters; +package org.sonar.plugins.core.measurefilters; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.Qualifiers; @@ -49,7 +49,6 @@ public class ProjectFilter extends FilterTemplate { .add(FilterColumn.create("version", null, FilterColumn.DESC, false)) .add(FilterColumn.create("metric", CoreMetrics.NCLOC_KEY, FilterColumn.DESC, false)) .add(FilterColumn.create("metric", CoreMetrics.VIOLATIONS_DENSITY_KEY, FilterColumn.DESC, false)) - .add(FilterColumn.create("date", null, FilterColumn.DESC, false)) - .add(FilterColumn.create("links", null, FilterColumn.DESC, false)); + .add(FilterColumn.create("date", null, FilterColumn.DESC, false)); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java index 83772b25ac0..ae8c38be5ee 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/GlobalDefaultDashboardTest.java @@ -26,8 +26,8 @@ import org.sonar.api.web.Dashboard.Widget; import org.sonar.core.measure.MeasureFilterDao; import org.sonar.core.measure.MeasureFilterDto; import org.sonar.plugins.core.CorePlugin; -import org.sonar.plugins.core.filters.MyFavouritesFilter; -import org.sonar.plugins.core.filters.ProjectFilter; +import org.sonar.plugins.core.measurefilters.MyFavouritesFilter; +import org.sonar.plugins.core.measurefilters.ProjectFilter; import org.sonar.plugins.core.widgets.MeasureFilterListWidget; import org.sonar.plugins.core.widgets.MeasureFilterTreemapWidget; import org.sonar.plugins.core.widgets.WelcomeWidget; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/MyFavouritesFilterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java index e9faed66f21..b8164e10e76 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/MyFavouritesFilterTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.core.filters; +package org.sonar.plugins.core.measurefilters; import org.junit.Test; import org.sonar.api.web.Filter; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/ProjectFilterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java index 32d46c9455f..fbb84d3dff2 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/ProjectFilterTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.core.filters; +package org.sonar.plugins.core.measurefilters; import org.junit.Test; import org.sonar.api.web.Filter; @@ -35,7 +35,7 @@ public class ProjectFilterTest { assertThat(template.getName()).isEqualTo("Projects"); assertThat(filter).isNotNull(); assertThat(filter.getCriteria()).hasSize(1); - assertThat(filter.getColumns()).hasSize(7); + assertThat(filter.getColumns()).hasSize(6); } @Test |