From: Simon Brandhof Date: Sun, 9 Dec 2012 19:27:32 +0000 (+0100) Subject: SONAR-3825 rename package org.sonar.plugins.core.measurefilters X-Git-Tag: 3.4~92 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5145e6797559e2187c3f30abef2024c0d78624e8;p=sonarqube.git SONAR-3825 rename package org.sonar.plugins.core.measurefilters + remove the links column from homepage --- 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/filters/MyFavouritesFilter.java deleted file mode 100644 index ea66def1484..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/MyFavouritesFilter.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Sonar, open source software quality management tool. - * Copyright (C) 2008-2012 SonarSource - * mailto:contact AT sonarsource DOT com - * - * Sonar is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * Sonar is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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; - -import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.web.Filter; -import org.sonar.api.web.FilterColumn; -import org.sonar.api.web.FilterTemplate; - -/** - * Default filter for looking for user favourite resources. - * - * @since 3.1 - */ -public class MyFavouritesFilter extends FilterTemplate { - public static final String NAME = "My favourites"; - - @Override - public String getName() { - return NAME; - } - - @Override - public Filter createFilter() { - return Filter.create() - .setDisplayAs(Filter.LIST) - .setFavouritesOnly(true) - .add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false)) - .add(FilterColumn.create("name", null, FilterColumn.ASC, false)) - .add(FilterColumn.create("date", null, FilterColumn.DESC, false)); - } -} 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/filters/ProjectFilter.java deleted file mode 100644 index 50f387f7bf0..00000000000 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/ProjectFilter.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Sonar, open source software quality management tool. - * Copyright (C) 2008-2012 SonarSource - * mailto:contact AT sonarsource DOT com - * - * Sonar is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * Sonar is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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; - -import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.resources.Qualifiers; -import org.sonar.api.web.Criterion; -import org.sonar.api.web.Filter; -import org.sonar.api.web.FilterColumn; -import org.sonar.api.web.FilterTemplate; - -/** - * Default projects filter. - * - * @since 3.1 - */ -public class ProjectFilter extends FilterTemplate { - public static final String NAME = "Projects"; - - @Override - public String getName() { - return NAME; - } - - @Override - public Filter createFilter() { - return Filter.create() - .setDisplayAs(Filter.LIST) - .add(Criterion.createForQualifier(Qualifiers.PROJECT)) - .add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false)) - .add(FilterColumn.create("name", null, FilterColumn.ASC, false)) - .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)); - } -} diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java new file mode 100644 index 00000000000..ef7e17c146e --- /dev/null +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilter.java @@ -0,0 +1,49 @@ +/* + * Sonar, open source software quality management tool. + * Copyright (C) 2008-2012 SonarSource + * mailto:contact AT sonarsource DOT com + * + * Sonar is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * Sonar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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.measurefilters; + +import org.sonar.api.measures.CoreMetrics; +import org.sonar.api.web.Filter; +import org.sonar.api.web.FilterColumn; +import org.sonar.api.web.FilterTemplate; + +/** + * Default filter for looking for user favourite resources. + * + * @since 3.1 + */ +public class MyFavouritesFilter extends FilterTemplate { + public static final String NAME = "My favourites"; + + @Override + public String getName() { + return NAME; + } + + @Override + public Filter createFilter() { + return Filter.create() + .setDisplayAs(Filter.LIST) + .setFavouritesOnly(true) + .add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false)) + .add(FilterColumn.create("name", null, FilterColumn.ASC, false)) + .add(FilterColumn.create("date", null, FilterColumn.DESC, false)); + } +} diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java new file mode 100644 index 00000000000..c8f0173cbd1 --- /dev/null +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/measurefilters/ProjectFilter.java @@ -0,0 +1,54 @@ +/* + * Sonar, open source software quality management tool. + * Copyright (C) 2008-2012 SonarSource + * mailto:contact AT sonarsource DOT com + * + * Sonar is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * Sonar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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.measurefilters; + +import org.sonar.api.measures.CoreMetrics; +import org.sonar.api.resources.Qualifiers; +import org.sonar.api.web.Criterion; +import org.sonar.api.web.Filter; +import org.sonar.api.web.FilterColumn; +import org.sonar.api.web.FilterTemplate; + +/** + * Default projects filter. + * + * @since 3.1 + */ +public class ProjectFilter extends FilterTemplate { + public static final String NAME = "Projects"; + + @Override + public String getName() { + return NAME; + } + + @Override + public Filter createFilter() { + return Filter.create() + .setDisplayAs(Filter.LIST) + .add(Criterion.createForQualifier(Qualifiers.PROJECT)) + .add(FilterColumn.create("metric", CoreMetrics.ALERT_STATUS_KEY, FilterColumn.DESC, false)) + .add(FilterColumn.create("name", null, FilterColumn.ASC, false)) + .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)); + } +} 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/filters/MyFavouritesFilterTest.java deleted file mode 100644 index e9faed66f21..00000000000 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/MyFavouritesFilterTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Sonar, open source software quality management tool. - * Copyright (C) 2008-2012 SonarSource - * mailto:contact AT sonarsource DOT com - * - * Sonar is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * Sonar is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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; - -import org.junit.Test; -import org.sonar.api.web.Filter; -import org.sonar.plugins.core.CorePlugin; - -import static org.fest.assertions.Assertions.assertThat; - -public class MyFavouritesFilterTest { - @Test - public void should_create_filter() { - MyFavouritesFilter template = new MyFavouritesFilter(); - - Filter filter = template.createFilter(); - - assertThat(template.getName()).isEqualTo("My favourites"); - assertThat(filter).isNotNull(); - assertThat(filter.isFavouritesOnly()).isTrue(); - assertThat(filter.getCriteria()).isEmpty(); - assertThat(filter.getColumns()).hasSize(3); - } - - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(MyFavouritesFilter.class); - } -} 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/filters/ProjectFilterTest.java deleted file mode 100644 index 32d46c9455f..00000000000 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/ProjectFilterTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Sonar, open source software quality management tool. - * Copyright (C) 2008-2012 SonarSource - * mailto:contact AT sonarsource DOT com - * - * Sonar is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * Sonar is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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; - -import org.junit.Test; -import org.sonar.api.web.Filter; -import org.sonar.plugins.core.CorePlugin; - -import static org.fest.assertions.Assertions.assertThat; - -public class ProjectFilterTest { - @Test - public void should_create_filter() { - ProjectFilter template = new ProjectFilter(); - - Filter filter = template.createFilter(); - - assertThat(template.getName()).isEqualTo("Projects"); - assertThat(filter).isNotNull(); - assertThat(filter.getCriteria()).hasSize(1); - assertThat(filter.getColumns()).hasSize(7); - } - - @Test - public void should_be_registered_as_an_extension() { - assertThat(new CorePlugin().getExtensions()).contains(ProjectFilter.class); - } -} diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java new file mode 100644 index 00000000000..b8164e10e76 --- /dev/null +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/MyFavouritesFilterTest.java @@ -0,0 +1,46 @@ +/* + * Sonar, open source software quality management tool. + * Copyright (C) 2008-2012 SonarSource + * mailto:contact AT sonarsource DOT com + * + * Sonar is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * Sonar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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.measurefilters; + +import org.junit.Test; +import org.sonar.api.web.Filter; +import org.sonar.plugins.core.CorePlugin; + +import static org.fest.assertions.Assertions.assertThat; + +public class MyFavouritesFilterTest { + @Test + public void should_create_filter() { + MyFavouritesFilter template = new MyFavouritesFilter(); + + Filter filter = template.createFilter(); + + assertThat(template.getName()).isEqualTo("My favourites"); + assertThat(filter).isNotNull(); + assertThat(filter.isFavouritesOnly()).isTrue(); + assertThat(filter.getCriteria()).isEmpty(); + assertThat(filter.getColumns()).hasSize(3); + } + + @Test + public void should_be_registered_as_an_extension() { + assertThat(new CorePlugin().getExtensions()).contains(MyFavouritesFilter.class); + } +} diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java new file mode 100644 index 00000000000..fbb84d3dff2 --- /dev/null +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/measurefilters/ProjectFilterTest.java @@ -0,0 +1,45 @@ +/* + * Sonar, open source software quality management tool. + * Copyright (C) 2008-2012 SonarSource + * mailto:contact AT sonarsource DOT com + * + * Sonar is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * Sonar is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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.measurefilters; + +import org.junit.Test; +import org.sonar.api.web.Filter; +import org.sonar.plugins.core.CorePlugin; + +import static org.fest.assertions.Assertions.assertThat; + +public class ProjectFilterTest { + @Test + public void should_create_filter() { + ProjectFilter template = new ProjectFilter(); + + Filter filter = template.createFilter(); + + assertThat(template.getName()).isEqualTo("Projects"); + assertThat(filter).isNotNull(); + assertThat(filter.getCriteria()).hasSize(1); + assertThat(filter.getColumns()).hasSize(6); + } + + @Test + public void should_be_registered_as_an_extension() { + assertThat(new CorePlugin().getExtensions()).contains(ProjectFilter.class); + } +}