diff options
| author | David Gageot <david@gageot.net> | 2012-05-23 08:53:45 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2012-05-23 10:11:04 +0200 |
| commit | 02a640ea12a7e3a0285d0c68ab0733689b6ea0ff (patch) | |
| tree | b9c68fd283260fb416b7163ba2f729f35283b371 /plugins | |
| parent | ecfbbb79cfe15b104e6701b48adf5ebb1ca99291 (diff) | |
| download | sonarqube-02a640ea12a7e3a0285d0c68ab0733689b6ea0ff.tar.gz sonarqube-02a640ea12a7e3a0285d0c68ab0733689b6ea0ff.zip | |
SONAR-3016 Don't load default filters if they already exist
Diffstat (limited to 'plugins')
6 files changed, 6 insertions, 6 deletions
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 index 43e47fa0a36..ceb8b8ec1db 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/filters/MyFavouritesFilter.java @@ -33,7 +33,7 @@ import org.sonar.api.web.FilterTemplate; public class MyFavouritesFilter extends FilterTemplate { @Override public String getName() { - return "My favouritesBis"; + return "My favourites"; } @Override 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 index c5d3086cff4..368805b21bb 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/filters/ProjectFilter.java @@ -32,7 +32,7 @@ import org.sonar.api.web.FilterTemplate; public class ProjectFilter extends FilterTemplate { @Override public String getName() { - return "ProjectsBis"; + return "Projects"; } @Override diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java index f921a3c8267..0227fb71468 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/filters/TreeMapFilter.java @@ -33,7 +33,7 @@ import org.sonar.api.web.FilterTemplate; public class TreeMapFilter extends FilterTemplate { @Override public String getName() { - return "TreemapBis"; + return "Treemap"; } @Override 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 index 8b3cd981e96..089f06e8dcc 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/filters/MyFavouritesFilterTest.java @@ -31,7 +31,7 @@ public class MyFavouritesFilterTest { Filter filter = template.createFilter(); - assertThat(template.getName()).isEqualTo("My favouritesBis"); + assertThat(template.getName()).isEqualTo("My favourites"); assertThat(filter).isNotNull(); assertThat(filter.isFavouritesOnly()).isTrue(); assertThat(filter.getCriteria()).hasSize(1); 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 index 39196d82a5c..e918d19f36a 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/filters/ProjectFilterTest.java @@ -31,7 +31,7 @@ public class ProjectFilterTest { Filter filter = template.createFilter(); - assertThat(template.getName()).isEqualTo("ProjectsBis"); + assertThat(template.getName()).isEqualTo("Projects"); assertThat(filter).isNotNull(); assertThat(filter.getCriteria()).hasSize(1); assertThat(filter.getColumns()).hasSize(7); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/TreeMapFilterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/TreeMapFilterTest.java index c6c13695830..20d1e0b9841 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/TreeMapFilterTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/filters/TreeMapFilterTest.java @@ -31,7 +31,7 @@ public class TreeMapFilterTest { Filter filter = template.createFilter(); - assertThat(template.getName()).isEqualTo("TreemapBis"); + assertThat(template.getName()).isEqualTo("Treemap"); assertThat(filter).isNotNull(); assertThat(filter.getCriteria()).hasSize(1); assertThat(filter.getColumns()).hasSize(3); |