From 2ccd693c8ccefb423ab10368ac93fff2eccc1b1f Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Fri, 23 Jan 2015 12:14:00 +0100 Subject: [PATCH] SONAR-6060 Move HTML report into the core --- pom.xml | 5 + .../server/batch/GlobalRepositoryAction.java | 8 +- .../server/batch/ProjectRepositoryAction.java | 4 +- .../server/batch/ProjectRepositoryLoader.java | 18 +- .../batch/ProjectRepositoryActionTest.java | 4 +- .../ProjectRepositoryLoaderMediumTest.java | 44 +- ...erentials.java => GlobalRepositories.java} | 10 +- ...pository.java => ProjectRepositories.java} | 14 +- ...sTest.java => GlobalRepositoriesTest.java} | 6 +- ...Test.java => ProjectRepositoriesTest.java} | 6 +- sonar-batch/pom.xml | 5 + .../batch/bootstrap/BatchComponents.java | 14 +- .../batch/bootstrap/ExtensionInstaller.java | 2 +- .../sonar/batch/bootstrap/GlobalSettings.java | 6 +- .../batch/design/MavenDependenciesSensor.java | 2 + .../org/sonar/batch/index/BatchResource.java | 9 + .../issue/tracking/LocalIssueTracking.java | 18 +- .../batch/mediumtest/BatchMediumTester.java | 12 +- .../DefaultGlobalReferentialsLoader.java | 6 +- .../DefaultProjectReferentialsLoader.java | 6 +- .../repository/GlobalReferentialsLoader.java | 4 +- .../GlobalReferentialsProvider.java | 6 +- .../repository/ProjectRepositoriesLoader.java | 4 +- .../ProjectRepositoriesProvider.java | 6 +- .../sonar/batch/rule/ActiveRulesProvider.java | 6 +- .../org/sonar/batch/rule/ModuleQProfiles.java | 4 +- .../batch/rule/RuleFinderCompatibility.java | 6 +- .../org/sonar/batch/scan/ModuleSettings.java | 6 +- .../org/sonar/batch/scan/ProjectSettings.java | 6 +- .../batch/scan/filesystem/InputPathCache.java | 12 + .../scan/filesystem/StatusDetection.java | 6 +- .../filesystem/StatusDetectionFactory.java | 6 +- .../scan/measure/DefaultMetricFinder.java | 4 +- .../scan/measure/DeprecatedMetricFinder.java | 4 +- .../sonar/batch/scan/report/HtmlReport.java | 194 ++++++++ .../batch/scan/report/IssueVariation.java | 63 +++ .../sonar/batch/scan/report/IssuesReport.java | 94 ++++ .../scan/report/IssuesReportBuilder.java | 100 ++++ .../batch/scan/report/ReportRuleKey.java | 83 ++++ .../batch/scan/report/ReportSummary.java | 96 ++++ .../batch/scan/report/ResourceReport.java | 153 ++++++ .../batch/scan/report/RuleNameProvider.java | 58 +++ .../sonar/batch/scan/report/RuleReport.java | 56 +++ .../scan/report/RuleReportComparator.java | 64 +++ .../batch/scan/report/SourceProvider.java | 66 +++ .../java/org/sonar/batch/scm/ScmSensor.java | 6 +- .../sonar/batch/scan/report/issuesreport.ftl | 456 ++++++++++++++++++ .../scan/report/issuesreport_files/DIR.png | Bin 0 -> 390 bytes .../scan/report/issuesreport_files/FIL.png | Bin 0 -> 416 bytes .../scan/report/issuesreport_files/PRJ.png | Bin 0 -> 575 bytes .../report/issuesreport_files/favicon.ico | Bin 0 -> 5430 bytes .../report/issuesreport_files/jquery.min.js | 6 + .../scan/report/issuesreport_files/sep12.png | Bin 0 -> 118 bytes .../scan/report/issuesreport_files/sonar.css | 396 +++++++++++++++ .../scan/report/issuesreport_files/sonar.eot | Bin 0 -> 6468 bytes .../scan/report/issuesreport_files/sonar.svg | 33 ++ .../scan/report/issuesreport_files/sonar.ttf | Bin 0 -> 6312 bytes .../scan/report/issuesreport_files/sonar.woff | Bin 0 -> 6904 bytes .../issuesreport_files/sonarqube-24x100.png | Bin 0 -> 1477 bytes .../batch/bootstrap/GlobalSettingsTest.java | 6 +- .../mediumtest/issues/ReportsMediumTest.java | 23 +- .../sonar/batch/scan/ModuleSettingsTest.java | 6 +- .../batch/scan/ProjectScanContainerTest.java | 10 +- .../sonar/batch/scan/ProjectSettingsTest.java | 10 +- .../StatusDetectionFactoryTest.java | 4 +- .../scan/filesystem/StatusDetectionTest.java | 4 +- 66 files changed, 2126 insertions(+), 140 deletions(-) rename sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/{GlobalReferentials.java => GlobalRepositories.java} (87%) rename sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/{ProjectRepository.java => ProjectRepositories.java} (87%) rename sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/{GlobalReferentialsTest.java => GlobalRepositoriesTest.java} (95%) rename sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/{ProjectRepositoryTest.java => ProjectRepositoriesTest.java} (97%) create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/HtmlReport.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/IssueVariation.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/ResourceReport.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReport.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java create mode 100644 sonar-batch/src/main/java/org/sonar/batch/scan/report/SourceProvider.java create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/favicon.ico create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/jquery.min.js create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sep12.png create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.css create mode 100755 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.eot create mode 100755 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.svg create mode 100755 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.ttf create mode 100755 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonar.woff create mode 100644 sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/sonarqube-24x100.png diff --git a/pom.xml b/pom.xml index 63a4f2756ad..3041c24e976 100644 --- a/pom.xml +++ b/pom.xml @@ -1078,6 +1078,11 @@ sonar-runner-api 2.4 + + org.freemarker + freemarker + 2.3.20 + diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java index b939ac22566..c919c32267f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -import org.sonar.batch.protocol.input.GlobalReferentials; +import org.sonar.batch.protocol.input.GlobalRepositories; import org.sonar.core.measure.db.MetricDto; import org.sonar.core.permission.GlobalPermissions; import org.sonar.core.persistence.DbSession; @@ -62,7 +62,7 @@ public class GlobalRepositoryAction implements RequestHandler { DbSession session = dbClient.openSession(false); try { - GlobalReferentials ref = new GlobalReferentials(); + GlobalRepositories ref = new GlobalRepositories(); addMetrics(ref, session); addSettings(ref, hasScanPerm, hasDryRunPerm, session); @@ -73,7 +73,7 @@ public class GlobalRepositoryAction implements RequestHandler { } } - private void addMetrics(GlobalReferentials ref, DbSession session) { + private void addMetrics(GlobalRepositories ref, DbSession session) { for (MetricDto metric : dbClient.metricDao().findEnabled(session)) { Boolean optimizedBestValue = metric.isOptimizedBestValue(); ref.addMetric( @@ -90,7 +90,7 @@ public class GlobalRepositoryAction implements RequestHandler { } } - private void addSettings(GlobalReferentials ref, boolean hasScanPerm, boolean hasDryRunPerm, DbSession session) { + private void addSettings(GlobalRepositories ref, boolean hasScanPerm, boolean hasDryRunPerm, DbSession session) { for (PropertyDto propertyDto : propertiesDao.selectGlobalProperties(session)) { String key = propertyDto.getKey(); String value = propertyDto.getValue(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java index a6a40efbc45..baa4e4a703d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java @@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.server.plugins.MimeTypes; public class ProjectRepositoryAction implements RequestHandler { @@ -67,7 +67,7 @@ public class ProjectRepositoryAction implements RequestHandler { @Override public void handle(Request request, Response response) throws Exception { - ProjectRepository ref = projectReferentialsLoader.load(ProjectRepositoryQuery.create() + ProjectRepositories ref = projectReferentialsLoader.load(ProjectRepositoryQuery.create() .setModuleKey(request.mandatoryParam(PARAM_KEY)) .setProfileName(request.param(PARAM_PROFILE)) .setPreview(request.mandatoryParamAsBoolean(PARAM_PREVIEW))); diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java index deea4177e33..c4fd56d2bfe 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java @@ -28,7 +28,7 @@ import org.sonar.api.resources.Language; import org.sonar.api.resources.Languages; import org.sonar.api.rule.RuleKey; import org.sonar.batch.protocol.input.FileData; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.core.UtcDateUtils; import org.sonar.core.component.ComponentDto; import org.sonar.core.component.FilePathWithHashDto; @@ -77,13 +77,13 @@ public class ProjectRepositoryLoader implements ServerComponent { this.languages = languages; } - public ProjectRepository load(ProjectRepositoryQuery query) { + public ProjectRepositories load(ProjectRepositoryQuery query) { boolean hasScanPerm = UserSession.get().hasGlobalPermission(GlobalPermissions.SCAN_EXECUTION); checkPermission(query.isPreview()); DbSession session = dbClient.openSession(false); try { - ProjectRepository ref = new ProjectRepository(); + ProjectRepositories ref = new ProjectRepositories(); String projectKey = query.getModuleKey(); ComponentDto module = dbClient.componentDao().getNullableByKey(session, query.getModuleKey()); // Current project/module can be null when analysing a new project @@ -145,7 +145,7 @@ public class ProjectRepositoryLoader implements ServerComponent { } } - private void addSettingsToChildrenModules(ProjectRepository ref, String moduleKey, Map parentProperties, TreeModuleSettings treeModuleSettings, + private void addSettingsToChildrenModules(ProjectRepositories ref, String moduleKey, Map parentProperties, TreeModuleSettings treeModuleSettings, boolean hasScanPerm, DbSession session) { Map currentParentProperties = newHashMap(); currentParentProperties.putAll(parentProperties); @@ -158,7 +158,7 @@ public class ProjectRepositoryLoader implements ServerComponent { } } - private void addSettings(ProjectRepository ref, String module, Map properties) { + private void addSettings(ProjectRepositories ref, String module, Map properties) { if (!properties.isEmpty()) { ref.addSettings(module, properties); } @@ -180,7 +180,7 @@ public class ProjectRepositoryLoader implements ServerComponent { return !key.contains(".secured") || hasScanPerm; } - private void addProfiles(ProjectRepository ref, @Nullable String projectKey, @Nullable String profileName, DbSession session) { + private void addProfiles(ProjectRepositories ref, @Nullable String projectKey, @Nullable String profileName, DbSession session) { for (Language language : languages.all()) { String languageKey = language.getKey(); QualityProfileDto qualityProfileDto = getProfile(languageKey, projectKey, profileName, session); @@ -212,7 +212,7 @@ public class ProjectRepositoryLoader implements ServerComponent { } } - private void addActiveRules(ProjectRepository ref) { + private void addActiveRules(ProjectRepositories ref) { for (org.sonar.batch.protocol.input.QProfile qProfile : ref.qProfiles()) { for (ActiveRule activeRule : qProfileLoader.findActiveRulesByProfile(qProfile.key())) { Rule rule = ruleService.getNonNullByKey(activeRule.key().ruleKey()); @@ -231,7 +231,7 @@ public class ProjectRepositoryLoader implements ServerComponent { } } - private void addManualRules(ProjectRepository ref) { + private void addManualRules(ProjectRepositories ref) { Result ruleSearchResult = ruleService.search(new RuleQuery().setRepositories(newArrayList(RuleKey.MANUAL_REPOSITORY_KEY)), new QueryContext().setScroll(true) .setFieldsToReturn(newArrayList(RuleNormalizer.RuleField.KEY.field(), RuleNormalizer.RuleField.NAME.field()))); Iterator rules = ruleSearchResult.scroll(); @@ -245,7 +245,7 @@ public class ProjectRepositoryLoader implements ServerComponent { } } - private void addFileData(DbSession session, ProjectRepository ref, List moduleChildren, String moduleKey) { + private void addFileData(DbSession session, ProjectRepositories ref, List moduleChildren, String moduleKey) { Map moduleKeysByUuid = newHashMap(); for (ComponentDto module : moduleChildren) { moduleKeysByUuid.put(module.uuid(), module.key()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryActionTest.java index 97085c32ad9..7085f4b2499 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryActionTest.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; @@ -51,7 +51,7 @@ public class ProjectRepositoryActionTest { public void project_referentials() throws Exception { String projectKey = "org.codehaus.sonar:sonar"; - ProjectRepository projectReferentials = mock(ProjectRepository.class); + ProjectRepositories projectReferentials = mock(ProjectRepositories.class); when(projectReferentials.toJson()).thenReturn("{\"settingsByModule\": {}}"); ArgumentCaptor queryArgumentCaptor = ArgumentCaptor.forClass(ProjectRepositoryQuery.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java index 0b3ed071d82..7f282681b09 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java @@ -31,7 +31,7 @@ import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.utils.DateUtils; import org.sonar.batch.protocol.input.ActiveRule; import org.sonar.batch.protocol.input.FileData; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.batch.protocol.input.QProfile; import org.sonar.core.component.ComponentDto; import org.sonar.core.permission.GlobalPermissions; @@ -99,7 +99,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession); dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); Map projectSettings = ref.settings(project.key()); assertThat(projectSettings).isEqualTo(ImmutableMap.of( "sonar.jira.project.key", "SONAR", @@ -124,7 +124,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession); dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key()).setPreview(true)); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key()).setPreview(true)); Map projectSettings = ref.settings(project.key()); assertThat(projectSettings).isEqualTo(ImmutableMap.of( "sonar.jira.project.key", "SONAR" @@ -156,7 +156,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of( "sonar.jira.project.key", "SONAR", "sonar.jira.login.secured", "john" @@ -189,7 +189,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of( "sonar.jira.project.key", "SONAR", "sonar.jira.login.secured", "john" @@ -232,7 +232,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of( "sonar.jira.project.key", "SONAR", "sonar.jira.login.secured", "john" @@ -278,7 +278,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of( "sonar.jira.project.key", "SONAR", "sonar.jira.login.secured", "john" @@ -309,7 +309,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); assertThat(ref.settings(project.key())).isEqualTo(ImmutableMap.of( "sonar.jira.project.key", "SONAR", "sonar.jira.login.secured", "john" @@ -339,7 +339,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); assertThat(ref.settings(project.key())).isEmpty(); assertThat(ref.settings(module.key())).isEmpty(); assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of( @@ -374,7 +374,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); assertThat(ref.settings(project.key())).isEmpty(); assertThat(ref.settings(module.key())).isEmpty(); assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of( @@ -407,7 +407,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); assertThat(ref.settings(project.key())).isEmpty(); assertThat(ref.settings(module.key())).isEmpty(); assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of( @@ -441,7 +441,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(subModule.key())); assertThat(ref.settings(project.key())).isEmpty(); assertThat(ref.settings(module.key())).isEmpty(); assertThat(ref.settings(subModule.key())).isEqualTo(ImmutableMap.of( @@ -466,7 +466,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); List profiles = newArrayList(ref.qProfiles()); assertThat(profiles).hasSize(1); assertThat(profiles.get(0).key()).isEqualTo("abcd"); @@ -490,7 +490,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); List profiles = newArrayList(ref.qProfiles()); assertThat(profiles).hasSize(1); assertThat(profiles.get(0).key()).isEqualTo("abcd"); @@ -514,7 +514,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key()).setProfileName("SonarQube way")); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key()).setProfileName("SonarQube way")); List profiles = newArrayList(ref.qProfiles()); assertThat(profiles).hasSize(1); assertThat(profiles.get(0).key()).isEqualTo("abcd"); @@ -535,7 +535,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey("project")); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey("project")); List profiles = newArrayList(ref.qProfiles()); assertThat(profiles).hasSize(1); assertThat(profiles.get(0).key()).isEqualTo("abcd"); @@ -560,7 +560,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); List profiles = newArrayList(ref.qProfiles()); assertThat(profiles).hasSize(1); assertThat(profiles.get(0).key()).isEqualTo("abcd"); @@ -611,7 +611,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); List activeRules = newArrayList(ref.activeRules()); assertThat(activeRules).hasSize(1); assertThat(activeRules.get(0).repositoryKey()).isEqualTo("squid"); @@ -636,7 +636,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); List activeRules = newArrayList(ref.activeRules()); assertThat(activeRules).extracting("repositoryKey").containsOnly(RuleKey.MANUAL_REPOSITORY_KEY); assertThat(activeRules).extracting("ruleKey").containsOnly("manualRuleKey"); @@ -693,7 +693,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); assertThat(ref.fileDataByPath(project.key())).hasSize(1); FileData fileData = ref.fileData(project.key(), file.path()); assertThat(fileData.hash()).isEqualTo("123456"); @@ -722,7 +722,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(project.key())); assertThat(ref.fileData(project.key(), projectFile.path()).hash()).isEqualTo("123456"); assertThat(ref.fileData(module.key(), moduleFile.path()).hash()).isEqualTo("789456"); } @@ -750,7 +750,7 @@ public class ProjectRepositoryLoaderMediumTest { dbSession.commit(); - ProjectRepository ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(module.key())); + ProjectRepositories ref = loader.load(ProjectRepositoryQuery.create().setModuleKey(module.key())); assertThat(ref.fileData(module.key(), moduleFile.path()).hash()).isEqualTo("789456"); assertThat(ref.fileData(project.key(), projectFile.path())).isNull(); } diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java similarity index 87% rename from sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java rename to sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java index e7501e4d1de..4dccd3a286f 100644 --- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalReferentials.java +++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/GlobalRepositories.java @@ -30,7 +30,7 @@ import java.util.Map; * Container for all global data going from server to batch. * This is not an API since server and batch always share the same version. */ -public class GlobalReferentials { +public class GlobalRepositories { private long timestamp; private Collection metrics = new ArrayList(); @@ -40,7 +40,7 @@ public class GlobalReferentials { return globalSettings; } - public GlobalReferentials addGlobalSetting(String key, String value) { + public GlobalRepositories addGlobalSetting(String key, String value) { globalSettings.put(key, value); return this; } @@ -49,7 +49,7 @@ public class GlobalReferentials { return metrics; } - public GlobalReferentials addMetric(Metric metric) { + public GlobalRepositories addMetric(Metric metric) { metrics.add(metric); return this; } @@ -66,8 +66,8 @@ public class GlobalReferentials { return GsonHelper.create().toJson(this); } - public static GlobalReferentials fromJson(String json) { - return GsonHelper.create().fromJson(json, GlobalReferentials.class); + public static GlobalRepositories fromJson(String json) { + return GsonHelper.create().fromJson(json, GlobalRepositories.class); } } diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepository.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java similarity index 87% rename from sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepository.java rename to sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java index f207a34d989..eb3200b6ac3 100644 --- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepository.java +++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectRepositories.java @@ -30,7 +30,7 @@ import java.util.*; * Container for all project data going from server to batch. * This is not an API since server and batch always share the same version. */ -public class ProjectRepository { +public class ProjectRepositories { private long timestamp; private Map qprofilesByLanguage = new HashMap(); @@ -43,7 +43,7 @@ public class ProjectRepository { return settingsByModule.containsKey(moduleKey) ? settingsByModule.get(moduleKey) : Collections.emptyMap(); } - public ProjectRepository addSettings(String moduleKey, Map settings) { + public ProjectRepositories addSettings(String moduleKey, Map settings) { Map existingSettings = settingsByModule.get(moduleKey); if (existingSettings == null) { existingSettings = new HashMap<>(); @@ -57,7 +57,7 @@ public class ProjectRepository { return qprofilesByLanguage.values(); } - public ProjectRepository addQProfile(QProfile qProfile) { + public ProjectRepositories addQProfile(QProfile qProfile) { qprofilesByLanguage.put(qProfile.language(), qProfile); return this; } @@ -66,7 +66,7 @@ public class ProjectRepository { return activeRules; } - public ProjectRepository addActiveRule(ActiveRule activeRule) { + public ProjectRepositories addActiveRule(ActiveRule activeRule) { activeRules.add(activeRule); return this; } @@ -75,7 +75,7 @@ public class ProjectRepository { return fileDataByModuleAndPath.containsKey(moduleKey) ? fileDataByModuleAndPath.get(moduleKey) : Collections.emptyMap(); } - public ProjectRepository addFileData(String moduleKey, String path, FileData fileData) { + public ProjectRepositories addFileData(String moduleKey, String path, FileData fileData) { Map existingFileDataByPath = fileDataByModuleAndPath.get(moduleKey); if (existingFileDataByPath == null) { existingFileDataByPath = new HashMap<>(); @@ -111,8 +111,8 @@ public class ProjectRepository { return GsonHelper.create().toJson(this); } - public static ProjectRepository fromJson(String json) { - return GsonHelper.create().fromJson(json, ProjectRepository.class); + public static ProjectRepositories fromJson(String json) { + return GsonHelper.create().fromJson(json, ProjectRepositories.class); } } diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java similarity index 95% rename from sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java rename to sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java index cc4593cbbb7..2f4652d3ded 100644 --- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java +++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java @@ -25,11 +25,11 @@ import org.skyscreamer.jsonassert.JSONAssert; import static org.assertj.core.api.Assertions.assertThat; -public class GlobalReferentialsTest { +public class GlobalRepositoriesTest { @Test public void to_json() throws Exception { - GlobalReferentials ref = new GlobalReferentials(); + GlobalRepositories ref = new GlobalRepositories(); ref.addMetric(new Metric(1, "ncloc", "INT", "Description", -1, "NCLOC", true, false, 2.0, 1.0, true)); ref.addGlobalSetting("prop", "value"); ref.setTimestamp(10); @@ -44,7 +44,7 @@ public class GlobalReferentialsTest { @Test public void from_json() throws JSONException { - GlobalReferentials ref = GlobalReferentials + GlobalRepositories ref = GlobalRepositories .fromJson( "{timestamp:1," + "metrics:[{id:1,key:ncloc,valueType:DATA,description:Description,direction:-1,name:NCLOC,qualitative:true,userManaged:false,worstValue:2.0,bestValue:1.0,optimizedBestValue:true}]," diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoryTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoriesTest.java similarity index 97% rename from sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoryTest.java rename to sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoriesTest.java index d60222b455a..e4eb540d291 100644 --- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoryTest.java +++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectRepositoriesTest.java @@ -29,11 +29,11 @@ import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -public class ProjectRepositoryTest { +public class ProjectRepositoriesTest { @Test public void testToJson() throws Exception { - ProjectRepository ref = new ProjectRepository(); + ProjectRepositories ref = new ProjectRepositories(); assertThat(ref.settings("foo")).isEmpty(); ref.addQProfile(new QProfile("squid-java", "Java", "java", new SimpleDateFormat("dd/MM/yyyy").parse("14/03/1984"))); @@ -66,7 +66,7 @@ public class ProjectRepositoryTest { @Test public void testFromJson() throws JSONException, ParseException { - ProjectRepository ref = ProjectRepository + ProjectRepositories ref = ProjectRepositories .fromJson("{timestamp:1," + "qprofilesByLanguage:{java:{key:\"squid-java\",name:Java,language:java,rulesUpdatedAt:\"1984-03-14T00:00:00+0100\"}}," + "activeRules:[{repositoryKey:repo,ruleKey:rule,name:Rule,severity:MAJOR,internalKey:rule1,language:java,params:{param1:value1}}]," diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index 63b2fd4af99..c7f63892495 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -127,6 +127,11 @@ com.github.kevinsawicki http-request + + + org.freemarker + freemarker + diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java index dca499c6869..34df9a2e678 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java @@ -32,7 +32,11 @@ import org.sonar.batch.maven.MavenProjectBootstrapper; import org.sonar.batch.maven.MavenProjectBuilder; import org.sonar.batch.maven.MavenProjectConverter; import org.sonar.batch.scan.report.ConsoleReport; +import org.sonar.batch.scan.report.HtmlReport; +import org.sonar.batch.scan.report.IssuesReportBuilder; import org.sonar.batch.scan.report.JSONReport; +import org.sonar.batch.scan.report.RuleNameProvider; +import org.sonar.batch.scan.report.SourceProvider; import org.sonar.batch.scm.ScmConfiguration; import org.sonar.batch.scm.ScmSensor; import org.sonar.batch.source.LinesSensor; @@ -48,13 +52,12 @@ public class BatchComponents { // only static stuff } - public static Collection all() { + public static Collection all(AnalysisMode analysisMode) { List components = Lists.newArrayList( // Maven MavenProjectBootstrapper.class, DefaultMavenPluginExecutor.class, MavenProjectConverter.class, MavenProjectBuilder.class, // Design - MavenDependenciesSensor.class, ProjectDsmDecorator.class, SubProjectDsmDecorator.class, DirectoryDsmDecorator.class, @@ -73,12 +76,19 @@ public class BatchComponents { // Reports ConsoleReport.class, JSONReport.class, + HtmlReport.class, + IssuesReportBuilder.class, + SourceProvider.class, + RuleNameProvider.class, // dbcleaner DefaultPeriodCleaner.class, DefaultPurgeTask.class ); components.addAll(CorePropertyDefinitions.all()); + if (!analysisMode.isSensorMode()) { + components.add(MavenDependenciesSensor.class); + } return components; } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java index b7088cf4c01..765d138c9b3 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java @@ -45,7 +45,7 @@ public class ExtensionInstaller { public ExtensionInstaller install(ComponentContainer container, ExtensionMatcher matcher) { // core components - for (Object o : BatchComponents.all()) { + for (Object o : BatchComponents.all(analysisMode)) { doInstall(container, matcher, null, o); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java index befb89563fe..5752c5c0f55 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/GlobalSettings.java @@ -23,16 +23,16 @@ import org.sonar.api.CoreProperties; import org.sonar.api.config.PropertyDefinitions; import org.sonar.api.config.Settings; import org.sonar.api.utils.MessageException; -import org.sonar.batch.protocol.input.GlobalReferentials; +import org.sonar.batch.protocol.input.GlobalRepositories; public class GlobalSettings extends Settings { private final BootstrapProperties bootstrapProps; - private final GlobalReferentials globalReferentials; + private final GlobalRepositories globalReferentials; private final AnalysisMode mode; public GlobalSettings(BootstrapProperties bootstrapProps, PropertyDefinitions propertyDefinitions, - GlobalReferentials globalReferentials, AnalysisMode mode) { + GlobalRepositories globalReferentials, AnalysisMode mode) { super(propertyDefinitions); this.mode = mode; diff --git a/sonar-batch/src/main/java/org/sonar/batch/design/MavenDependenciesSensor.java b/sonar-batch/src/main/java/org/sonar/batch/design/MavenDependenciesSensor.java index dfa42401400..b0c37d4e82b 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/design/MavenDependenciesSensor.java +++ b/sonar-batch/src/main/java/org/sonar/batch/design/MavenDependenciesSensor.java @@ -55,6 +55,7 @@ import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.utils.SonarException; import org.sonar.batch.index.ResourcePersister; +import org.sonar.core.DryRunIncompatible; import java.lang.reflect.Type; import java.util.ArrayList; @@ -62,6 +63,7 @@ import java.util.Collection; import java.util.List; @SupportedEnvironment("maven") +@DryRunIncompatible public class MavenDependenciesSensor implements Sensor { private static final String SONAR_MAVEN_PROJECT_DEPENDENCY = "sonar.maven.projectDependencies"; diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/BatchResource.java b/sonar-batch/src/main/java/org/sonar/batch/index/BatchResource.java index f5049b91f49..7e2859d6d94 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/index/BatchResource.java +++ b/sonar-batch/src/main/java/org/sonar/batch/index/BatchResource.java @@ -21,6 +21,7 @@ package org.sonar.batch.index; import org.sonar.api.database.model.Snapshot; import org.sonar.api.resources.Resource; +import org.sonar.api.resources.ResourceUtils; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -74,4 +75,12 @@ public class BatchResource { public Collection children() { return children; } + + public boolean isFile() { + return ResourceUtils.isFile(r); + } + + public boolean isDir() { + return ResourceUtils.isDirectory(r); + } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java b/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java index e1ed38a1e07..97c1b031b5a 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java +++ b/sonar-batch/src/main/java/org/sonar/batch/issue/tracking/LocalIssueTracking.java @@ -29,7 +29,6 @@ import org.sonar.api.batch.rule.ActiveRules; import org.sonar.api.issue.Issue; import org.sonar.api.issue.internal.DefaultIssue; import org.sonar.api.issue.internal.IssueChangeContext; -import org.sonar.api.resources.File; import org.sonar.api.resources.Project; import org.sonar.api.resources.ResourceUtils; import org.sonar.api.rule.RuleKey; @@ -96,9 +95,8 @@ public class LocalIssueTracking implements BatchComponent { } SourceHashHolder sourceHashHolder = null; - if (ResourceUtils.isFile(component.resource())) { - File sonarFile = (File) component.resource(); - InputFile file = inputPathCache.getFile(component.parent().parent().resource().getEffectiveKey(), sonarFile.getPath()); + if (component.isFile()) { + InputFile file = (InputFile) inputPathCache.getInputPath(component); if (file == null) { throw new IllegalStateException("Resource " + component.resource() + " was not found in InputPath cache"); } @@ -152,9 +150,8 @@ public class LocalIssueTracking implements BatchComponent { private void addUnmatched(Collection unmatchedIssues, SourceHashHolder sourceHashHolder, Collection issues) { for (PreviousIssue unmatchedIssue : unmatchedIssues) { org.sonar.batch.protocol.input.issues.PreviousIssue unmatchedPreviousIssue = ((PreviousIssueFromWs) unmatchedIssue).getDto(); - ActiveRule activeRule = activeRules.find(unmatchedIssue.ruleKey()); DefaultIssue unmatched = toUnmatchedIssue(unmatchedPreviousIssue); - if (activeRule != null && !Issue.STATUS_CLOSED.equals(unmatchedPreviousIssue.status())) { + if (unmatchedIssue.ruleKey().isManual() && !Issue.STATUS_CLOSED.equals(unmatchedPreviousIssue.status())) { relocateManualIssue(unmatched, unmatchedIssue, sourceHashHolder); } updateUnmatchedIssue(unmatched, false /* manual issues can be kept open */); @@ -197,8 +194,15 @@ public class LocalIssueTracking implements BatchComponent { private void updateUnmatchedIssue(DefaultIssue issue, boolean forceEndOfLife) { ActiveRule activeRule = activeRules.find(issue.ruleKey()); + issue.setNew(false); + + boolean manualIssue = issue.ruleKey().isManual(); boolean isRemovedRule = activeRule == null; - issue.setEndOfLife(forceEndOfLife || isRemovedRule); + if (manualIssue) { + issue.setEndOfLife(forceEndOfLife || isRemovedRule); + } else { + issue.setEndOfLife(true); + } issue.setOnDisabledRule(isRemovedRule); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java index 27bbc64ef0a..80f52440152 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java +++ b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java @@ -32,8 +32,8 @@ import org.sonar.batch.bootstrap.TaskProperties; import org.sonar.batch.bootstrapper.Batch; import org.sonar.batch.bootstrapper.EnvironmentInformation; import org.sonar.batch.protocol.input.ActiveRule; -import org.sonar.batch.protocol.input.GlobalReferentials; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.GlobalRepositories; +import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.batch.protocol.input.issues.PreviousIssue; import org.sonar.batch.repository.GlobalReferentialsLoader; import org.sonar.batch.repository.PreviousIssuesLoader; @@ -198,10 +198,10 @@ public class BatchMediumTester { private int metricId = 1; - private GlobalReferentials ref = new GlobalReferentials(); + private GlobalRepositories ref = new GlobalRepositories(); @Override - public GlobalReferentials load() { + public GlobalRepositories load() { return ref; } @@ -229,10 +229,10 @@ public class BatchMediumTester { private static class FakeProjectReferentialsLoader implements ProjectRepositoriesLoader { - private ProjectRepository ref = new ProjectRepository(); + private ProjectRepositories ref = new ProjectRepositories(); @Override - public ProjectRepository load(ProjectReactor reactor, TaskProperties taskProperties) { + public ProjectRepositories load(ProjectReactor reactor, TaskProperties taskProperties) { return ref; } diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultGlobalReferentialsLoader.java b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultGlobalReferentialsLoader.java index 91012f9a6e3..409e776ab31 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultGlobalReferentialsLoader.java +++ b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultGlobalReferentialsLoader.java @@ -20,7 +20,7 @@ package org.sonar.batch.repository; import org.sonar.batch.bootstrap.ServerClient; -import org.sonar.batch.protocol.input.GlobalReferentials; +import org.sonar.batch.protocol.input.GlobalRepositories; public class DefaultGlobalReferentialsLoader implements GlobalReferentialsLoader { @@ -33,8 +33,8 @@ public class DefaultGlobalReferentialsLoader implements GlobalReferentialsLoader } @Override - public GlobalReferentials load() { - return GlobalReferentials.fromJson(serverClient.request(BATCH_GLOBAL_URL)); + public GlobalRepositories load() { + return GlobalRepositories.fromJson(serverClient.request(BATCH_GLOBAL_URL)); } } diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectReferentialsLoader.java b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectReferentialsLoader.java index de45aeaf428..d653570d37a 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectReferentialsLoader.java +++ b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectReferentialsLoader.java @@ -35,7 +35,7 @@ import org.sonar.batch.bootstrap.AnalysisMode; import org.sonar.batch.bootstrap.ServerClient; import org.sonar.batch.bootstrap.TaskProperties; import org.sonar.batch.protocol.input.FileData; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.batch.rule.ModuleQProfiles; import javax.annotation.CheckForNull; @@ -71,7 +71,7 @@ public class DefaultProjectReferentialsLoader implements ProjectRepositoriesLoad } @Override - public ProjectRepository load(ProjectReactor reactor, TaskProperties taskProperties) { + public ProjectRepositories load(ProjectReactor reactor, TaskProperties taskProperties) { String projectKey = reactor.getRoot().getKeyWithBranch(); String url = BATCH_PROJECT_URL + "?key=" + ServerClient.encodeForUrl(projectKey); if (taskProperties.properties().containsKey(ModuleQProfiles.SONAR_PROFILE_PROP)) { @@ -80,7 +80,7 @@ public class DefaultProjectReferentialsLoader implements ProjectRepositoriesLoad url += "&profile=" + ServerClient.encodeForUrl(taskProperties.properties().get(ModuleQProfiles.SONAR_PROFILE_PROP)); } url += "&preview=" + analysisMode.isPreview(); - ProjectRepository ref = ProjectRepository.fromJson(serverClient.request(url)); + ProjectRepositories ref = ProjectRepositories.fromJson(serverClient.request(url)); if (session != null) { for (ProjectDefinition module : reactor.getProjects()) { diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsLoader.java b/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsLoader.java index 1dbbb520882..1d101827f14 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsLoader.java +++ b/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsLoader.java @@ -19,10 +19,10 @@ */ package org.sonar.batch.repository; -import org.sonar.batch.protocol.input.GlobalReferentials; +import org.sonar.batch.protocol.input.GlobalRepositories; public interface GlobalReferentialsLoader { - GlobalReferentials load(); + GlobalRepositories load(); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsProvider.java b/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsProvider.java index d3c99dc6552..eddee9c0deb 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsProvider.java +++ b/sonar-batch/src/main/java/org/sonar/batch/repository/GlobalReferentialsProvider.java @@ -23,15 +23,15 @@ import org.picocontainer.injectors.ProviderAdapter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.utils.TimeProfiler; -import org.sonar.batch.protocol.input.GlobalReferentials; +import org.sonar.batch.protocol.input.GlobalRepositories; public class GlobalReferentialsProvider extends ProviderAdapter { private static final Logger LOG = LoggerFactory.getLogger(GlobalReferentialsProvider.class); - private GlobalReferentials globalReferentials; + private GlobalRepositories globalReferentials; - public GlobalReferentials provide(GlobalReferentialsLoader loader) { + public GlobalRepositories provide(GlobalReferentialsLoader loader) { if (globalReferentials == null) { TimeProfiler profiler = new TimeProfiler(LOG).start("Load global referentials"); try { diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java b/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java index 75caa6f3b4f..5471f1e511e 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java +++ b/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesLoader.java @@ -21,10 +21,10 @@ package org.sonar.batch.repository; import org.sonar.api.batch.bootstrap.ProjectReactor; import org.sonar.batch.bootstrap.TaskProperties; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; public interface ProjectRepositoriesLoader { - ProjectRepository load(ProjectReactor reactor, TaskProperties taskProperties); + ProjectRepositories load(ProjectReactor reactor, TaskProperties taskProperties); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java b/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java index c9cf9e40537..390f81786af 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java +++ b/sonar-batch/src/main/java/org/sonar/batch/repository/ProjectRepositoriesProvider.java @@ -25,15 +25,15 @@ import org.slf4j.LoggerFactory; import org.sonar.api.batch.bootstrap.ProjectReactor; import org.sonar.api.utils.TimeProfiler; import org.sonar.batch.bootstrap.TaskProperties; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; public class ProjectRepositoriesProvider extends ProviderAdapter { private static final Logger LOG = LoggerFactory.getLogger(ProjectRepositoriesProvider.class); - private ProjectRepository projectReferentials; + private ProjectRepositories projectReferentials; - public ProjectRepository provide(ProjectRepositoriesLoader loader, ProjectReactor reactor, TaskProperties taskProps) { + public ProjectRepositories provide(ProjectRepositoriesLoader loader, ProjectReactor reactor, TaskProperties taskProps) { if (projectReferentials == null) { TimeProfiler profiler = new TimeProfiler(LOG).start("Load project referentials"); try { diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java b/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java index 4ae65303f0e..3b12b701136 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java +++ b/sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java @@ -25,7 +25,7 @@ import org.sonar.api.batch.rule.internal.ActiveRulesBuilder; import org.sonar.api.batch.rule.internal.NewActiveRule; import org.sonar.api.rule.RuleKey; import org.sonar.batch.protocol.input.ActiveRule; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import java.util.Map.Entry; @@ -37,14 +37,14 @@ public class ActiveRulesProvider extends ProviderAdapter { private ActiveRules singleton = null; - public ActiveRules provide(ProjectRepository ref) { + public ActiveRules provide(ProjectRepositories ref) { if (singleton == null) { singleton = load(ref); } return singleton; } - private ActiveRules load(ProjectRepository ref) { + private ActiveRules load(ProjectRepositories ref) { ActiveRulesBuilder builder = new ActiveRulesBuilder(); for (ActiveRule activeRule : ref.activeRules()) { NewActiveRule newActiveRule = builder.create(RuleKey.of(activeRule.repositoryKey(), activeRule.ruleKey())); diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java b/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java index badcc7878c6..9c0fe13d21e 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java +++ b/sonar-batch/src/main/java/org/sonar/batch/rule/ModuleQProfiles.java @@ -21,7 +21,7 @@ package org.sonar.batch.rule; import com.google.common.collect.ImmutableMap; import org.sonar.api.BatchComponent; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import javax.annotation.CheckForNull; @@ -36,7 +36,7 @@ public class ModuleQProfiles implements BatchComponent { public static final String SONAR_PROFILE_PROP = "sonar.profile"; private final Map byLanguage; - public ModuleQProfiles(ProjectRepository ref) { + public ModuleQProfiles(ProjectRepositories ref) { ImmutableMap.Builder builder = ImmutableMap.builder(); for (org.sonar.batch.protocol.input.QProfile qProfile : ref.qProfiles()) { diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java b/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java index 2fe3dc17d83..44e0cf47ccc 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java +++ b/sonar-batch/src/main/java/org/sonar/batch/rule/RuleFinderCompatibility.java @@ -19,8 +19,8 @@ */ package org.sonar.batch.rule; -import org.sonar.api.batch.rule.ActiveRule; import org.sonar.api.batch.rule.ActiveRules; +import org.sonar.api.batch.rule.internal.DefaultActiveRule; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; @@ -48,8 +48,8 @@ public class RuleFinderCompatibility implements RuleFinder { @Override public Rule findByKey(RuleKey key) { - ActiveRule ar = activeRules.find(key); - return ar == null ? null : Rule.create(key.repository(), key.rule()); + DefaultActiveRule ar = (DefaultActiveRule) activeRules.find(key); + return ar == null ? null : Rule.create(key.repository(), key.rule()).setName(ar.name()); } @Override diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java index 83b1c328deb..6d52c45efad 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleSettings.java @@ -27,7 +27,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.MessageException; import org.sonar.batch.bootstrap.AnalysisMode; import org.sonar.batch.bootstrap.GlobalSettings; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import java.util.List; @@ -36,10 +36,10 @@ import java.util.List; */ public class ModuleSettings extends Settings { - private final ProjectRepository projectReferentials; + private final ProjectRepositories projectReferentials; private AnalysisMode analysisMode; - public ModuleSettings(GlobalSettings batchSettings, ProjectDefinition project, ProjectRepository projectReferentials, + public ModuleSettings(GlobalSettings batchSettings, ProjectDefinition project, ProjectRepositories projectReferentials, AnalysisMode analysisMode) { super(batchSettings.getDefinitions()); this.projectReferentials = projectReferentials; diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectSettings.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectSettings.java index f6539dbfa7f..badac95a081 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectSettings.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectSettings.java @@ -28,18 +28,18 @@ import org.sonar.api.config.Settings; import org.sonar.api.utils.MessageException; import org.sonar.batch.bootstrap.AnalysisMode; import org.sonar.batch.bootstrap.GlobalSettings; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; public class ProjectSettings extends Settings { private static final Logger LOG = LoggerFactory.getLogger(ProjectSettings.class); private final GlobalSettings globalSettings; - private final ProjectRepository projectReferentials; + private final ProjectRepositories projectReferentials; private final AnalysisMode mode; public ProjectSettings(ProjectReactor reactor, GlobalSettings globalSettings, PropertyDefinitions propertyDefinitions, - ProjectRepository projectReferentials, AnalysisMode mode) { + ProjectRepositories projectReferentials, AnalysisMode mode) { super(propertyDefinitions); this.mode = mode; getEncryption().setPathToSecretKey(globalSettings.getString(CoreProperties.ENCRYPTION_SECRET_KEY_PATH)); diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java index 39672d7f7c5..adc1a16150c 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/InputPathCache.java @@ -24,6 +24,7 @@ import org.sonar.api.batch.fs.InputDir; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.fs.InputPath; import org.sonar.api.batch.fs.internal.DeprecatedDefaultInputFile; +import org.sonar.batch.index.BatchResource; import org.sonar.batch.index.Cache; import org.sonar.batch.index.Caches; @@ -91,8 +92,19 @@ public class InputPathCache implements BatchComponent { return (InputFile) cache.get(moduleKey, FILE, relativePath); } + @CheckForNull public InputDir getDir(String moduleKey, String relativePath) { return (InputDir) cache.get(moduleKey, DIR, relativePath); } + @CheckForNull + public InputPath getInputPath(BatchResource component) { + if (component.isFile()) { + return getFile(component.parent().parent().resource().getEffectiveKey(), component.resource().getPath()); + } else if (component.isDir()) { + return getDir(component.parent().parent().resource().getEffectiveKey(), component.resource().getPath()); + } + return null; + } + } diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java index 883268fcc01..36131c29331 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetection.java @@ -22,13 +22,13 @@ package org.sonar.batch.scan.filesystem; import org.apache.commons.lang.StringUtils; import org.sonar.api.batch.fs.InputFile; import org.sonar.batch.protocol.input.FileData; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; class StatusDetection { - private final ProjectRepository projectReferentials; + private final ProjectRepositories projectReferentials; - StatusDetection(ProjectRepository projectReferentials) { + StatusDetection(ProjectRepositories projectReferentials) { this.projectReferentials = projectReferentials; } diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java index 15e19d6457b..7ec9b895461 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/StatusDetectionFactory.java @@ -20,13 +20,13 @@ package org.sonar.batch.scan.filesystem; import org.sonar.api.BatchComponent; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; public class StatusDetectionFactory implements BatchComponent { - private final ProjectRepository projectReferentials; + private final ProjectRepositories projectReferentials; - public StatusDetectionFactory(ProjectRepository projectReferentials) { + public StatusDetectionFactory(ProjectRepositories projectReferentials) { this.projectReferentials = projectReferentials; } diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java index aac335178f5..5d2176b6b18 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DefaultMetricFinder.java @@ -24,7 +24,7 @@ import com.google.common.collect.Maps; import org.sonar.api.batch.measure.Metric; import org.sonar.api.batch.measure.MetricFinder; import org.sonar.api.measures.Metric.ValueType; -import org.sonar.batch.protocol.input.GlobalReferentials; +import org.sonar.batch.protocol.input.GlobalRepositories; import java.util.Collection; import java.util.List; @@ -34,7 +34,7 @@ public class DefaultMetricFinder implements MetricFinder { private Map metricsByKey = Maps.newLinkedHashMap(); - public DefaultMetricFinder(GlobalReferentials globalReferentials) { + public DefaultMetricFinder(GlobalRepositories globalReferentials) { for (org.sonar.batch.protocol.input.Metric metric : globalReferentials.metrics()) { metricsByKey.put(metric.key(), new org.sonar.api.measures.Metric.Builder(metric.key(), metric.key(), ValueType.valueOf(metric.valueType())).create()); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java index 761d0a74001..e1caebb6e16 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/measure/DeprecatedMetricFinder.java @@ -24,7 +24,7 @@ import com.google.common.collect.Maps; import org.sonar.api.measures.Metric; import org.sonar.api.measures.Metric.ValueType; import org.sonar.api.measures.MetricFinder; -import org.sonar.batch.protocol.input.GlobalReferentials; +import org.sonar.batch.protocol.input.GlobalRepositories; import java.util.Collection; import java.util.List; @@ -35,7 +35,7 @@ public final class DeprecatedMetricFinder implements MetricFinder { private Map metricsByKey = Maps.newLinkedHashMap(); private Map metricsById = Maps.newLinkedHashMap(); - public DeprecatedMetricFinder(GlobalReferentials globalReferentials) { + public DeprecatedMetricFinder(GlobalRepositories globalReferentials) { for (org.sonar.batch.protocol.input.Metric metric : globalReferentials.metrics()) { Metric hibernateMetric = new org.sonar.api.measures.Metric.Builder(metric.key(), metric.name(), ValueType.valueOf(metric.valueType())) .create() diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/HtmlReport.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/HtmlReport.java new file mode 100644 index 00000000000..315d59b62a9 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/HtmlReport.java @@ -0,0 +1,194 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import com.google.common.collect.Maps; +import freemarker.template.Template; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.sonar.api.Properties; +import org.sonar.api.Property; +import org.sonar.api.PropertyType; +import org.sonar.api.batch.fs.FileSystem; +import org.sonar.api.config.Settings; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.net.URISyntaxException; +import java.util.Map; + +@Properties({ + @Property(key = HtmlReport.HTML_REPORT_ENABLED_KEY, name = "Enable HTML report", description = "Set this to true to generate an HTML report", + type = PropertyType.BOOLEAN, defaultValue = "false"), + @Property(key = HtmlReport.HTML_REPORT_LOCATION_KEY, name = "HTML Report location", + description = "Location of the generated report. Can be absolute or relative to working directory", + type = PropertyType.STRING, defaultValue = HtmlReport.HTML_REPORT_LOCATION_DEFAULT, global = false, project = false), + @Property(key = HtmlReport.HTML_REPORT_NAME_KEY, name = "HTML Report name", + description = "Name of the generated report. Will be suffixed by .html or -light.html", + type = PropertyType.STRING, defaultValue = HtmlReport.HTML_REPORT_NAME_DEFAULT, global = false, project = false), + @Property(key = HtmlReport.HTML_REPORT_LIGHTMODE_ONLY, name = "Html report in light mode only", project = true, + description = "Set this to true to only generate the new issues report (light report)", + type = PropertyType.BOOLEAN, defaultValue = "false")}) +public class HtmlReport implements Reporter { + private static final Logger LOG = LoggerFactory.getLogger(HtmlReport.class); + + public static final String HTML_REPORT_ENABLED_KEY = "sonar.issuesReport.html.enable"; + public static final String HTML_REPORT_LOCATION_KEY = "sonar.issuesReport.html.location"; + public static final String HTML_REPORT_LOCATION_DEFAULT = "issues-report"; + public static final String HTML_REPORT_NAME_KEY = "sonar.issuesReport.html.name"; + public static final String HTML_REPORT_NAME_DEFAULT = "issues-report"; + public static final String HTML_REPORT_LIGHTMODE_ONLY = "sonar.issuesReport.lightModeOnly"; + + private final Settings settings; + private final FileSystem fs; + private final IssuesReportBuilder builder; + private final SourceProvider sourceProvider; + private final RuleNameProvider ruleNameProvider; + + public HtmlReport(Settings settings, FileSystem fs, IssuesReportBuilder builder, SourceProvider sourceProvider, RuleNameProvider ruleNameProvider) { + this.settings = settings; + this.fs = fs; + this.builder = builder; + this.sourceProvider = sourceProvider; + this.ruleNameProvider = ruleNameProvider; + } + + @Override + public void execute() { + if (settings.getBoolean(HTML_REPORT_ENABLED_KEY)) { + IssuesReport report = builder.buildReport(); + print(report); + } + } + + public void print(IssuesReport report) { + File reportFileDir = getReportFileDir(); + String reportName = settings.getString(HTML_REPORT_NAME_KEY); + if (!isLightModeOnly()) { + File reportFile = new File(reportFileDir, reportName + ".html"); + LOG.debug("Generating HTML Report to: " + reportFile.getAbsolutePath()); + writeToFile(report, reportFile, true); + LOG.info("HTML Issues Report generated: " + reportFile.getAbsolutePath()); + } + File lightReportFile = new File(reportFileDir, reportName + "-light.html"); + LOG.debug("Generating Light HTML Report to: " + lightReportFile.getAbsolutePath()); + writeToFile(report, lightReportFile, false); + LOG.info("Light HTML Issues Report generated: " + lightReportFile.getAbsolutePath()); + try { + copyDependencies(reportFileDir); + } catch (Exception e) { + throw new IllegalStateException("Fail to copy HTML report resources to: " + reportFileDir, e); + } + } + + private File getReportFileDir() { + String reportFileDirStr = settings.getString(HTML_REPORT_LOCATION_KEY); + File reportFileDir = new File(reportFileDirStr); + if (!reportFileDir.isAbsolute()) { + reportFileDir = new File(fs.workDir(), reportFileDirStr); + } + if (reportFileDirStr.endsWith(".html")) { + LOG.warn(HTML_REPORT_LOCATION_KEY + " should indicate a directory. Using parent folder."); + reportFileDir = reportFileDir.getParentFile(); + } + try { + FileUtils.forceMkdir(reportFileDir); + } catch (IOException e) { + throw new IllegalStateException("Fail to create the directory " + reportFileDirStr, e); + } + return reportFileDir; + } + + public void writeToFile(IssuesReport report, File toFile, boolean complete) { + Writer writer = null; + FileOutputStream fos = null; + try { + freemarker.log.Logger.selectLoggerLibrary(freemarker.log.Logger.LIBRARY_NONE); + freemarker.template.Configuration cfg = new freemarker.template.Configuration(); + cfg.setClassForTemplateLoading(HtmlReport.class, ""); + + Map root = Maps.newHashMap(); + root.put("report", report); + root.put("ruleNameProvider", ruleNameProvider); + root.put("sourceProvider", sourceProvider); + root.put("complete", complete); + + Template template = cfg.getTemplate("issuesreport.ftl"); + fos = new FileOutputStream(toFile); + writer = new OutputStreamWriter(fos, fs.encoding()); + template.process(root, writer); + writer.flush(); + + } catch (Exception e) { + throw new IllegalStateException("Fail to generate HTML Issues Report to: " + toFile, e); + + } finally { + IOUtils.closeQuietly(writer); + IOUtils.closeQuietly(fos); + } + } + + void copyDependencies(File toDir) throws URISyntaxException, IOException { + File target = new File(toDir, "issuesreport_files"); + FileUtils.forceMkdir(target); + + // I don't know how to extract a directory from classpath, that's why an exhaustive list of files + // is provided here : + copyDependency(target, "sonar.eot"); + copyDependency(target, "sonar.svg"); + copyDependency(target, "sonar.ttf"); + copyDependency(target, "sonar.woff"); + copyDependency(target, "favicon.ico"); + copyDependency(target, "PRJ.png"); + copyDependency(target, "DIR.png"); + copyDependency(target, "FIL.png"); + copyDependency(target, "jquery.min.js"); + copyDependency(target, "sep12.png"); + copyDependency(target, "sonar.css"); + copyDependency(target, "sonarqube-24x100.png"); + } + + private void copyDependency(File target, String filename) { + InputStream input = null; + OutputStream output = null; + try { + input = getClass().getResourceAsStream("/org/sonar/batch/scan/report/issuesreport_files/" + filename); + output = new FileOutputStream(new File(target, filename)); + IOUtils.copy(input, output); + + } catch (IOException e) { + throw new IllegalStateException("Fail to copy file " + filename + " to " + target, e); + } finally { + IOUtils.closeQuietly(input); + IOUtils.closeQuietly(output); + } + } + + public boolean isLightModeOnly() { + return settings.getBoolean(HTML_REPORT_LIGHTMODE_ONLY); + } +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssueVariation.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssueVariation.java new file mode 100644 index 00000000000..087bc1e9937 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssueVariation.java @@ -0,0 +1,63 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import org.apache.commons.lang.builder.ToStringBuilder; + +public class IssueVariation { + + private int countInCurrentAnalysis; + private int newIssuesCount; + private int resolvedIssuesCount; + + public int getCountInCurrentAnalysis() { + return countInCurrentAnalysis; + } + + public void incrementCountInCurrentAnalysis() { + this.countInCurrentAnalysis++; + } + + public int getNewIssuesCount() { + return newIssuesCount; + } + + public void incrementNewIssuesCount() { + this.newIssuesCount++; + } + + public int getResolvedIssuesCount() { + return resolvedIssuesCount; + } + + public void incrementResolvedIssuesCount() { + this.resolvedIssuesCount++; + } + + @Override + public String toString() { + return new ToStringBuilder(this). + append("countInCurrentAnalysis", countInCurrentAnalysis). + append("newIssuesCount", newIssuesCount). + append("resolvedIssuesCount", resolvedIssuesCount). + toString(); + } + +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java new file mode 100644 index 00000000000..a4513f65929 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReport.java @@ -0,0 +1,94 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import com.google.common.collect.Maps; +import org.sonar.api.issue.Issue; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RulePriority; +import org.sonar.batch.index.BatchResource; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +public class IssuesReport { + + public static final int TOO_MANY_ISSUES_THRESHOLD = 1000; + private String title; + private Date date; + private final ReportSummary summary = new ReportSummary(); + private final Map resourceReportsByResource = Maps.newLinkedHashMap(); + + public IssuesReport() { + } + + public ReportSummary getSummary() { + return summary; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Map getResourceReportsByResource() { + return resourceReportsByResource; + } + + public List getResourceReports() { + return new ArrayList(resourceReportsByResource.values()); + } + + public List getResourcesWithReport() { + return new ArrayList(resourceReportsByResource.keySet()); + } + + public void addIssueOnResource(BatchResource resource, Issue issue, Rule rule, RulePriority severity) { + addResource(resource); + getSummary().addIssue(issue, rule, severity); + resourceReportsByResource.get(resource).addIssue(issue, rule, RulePriority.valueOf(issue.severity())); + } + + public void addResolvedIssueOnResource(BatchResource resource, Issue issue, Rule rule, RulePriority severity) { + addResource(resource); + getSummary().addResolvedIssue(issue, rule, severity); + resourceReportsByResource.get(resource).addResolvedIssue(issue, rule, RulePriority.valueOf(issue.severity())); + } + + private void addResource(BatchResource resource) { + if (!resourceReportsByResource.containsKey(resource)) { + resourceReportsByResource.put(resource, new ResourceReport(resource)); + } + } + +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java new file mode 100644 index 00000000000..12dd08e79c0 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/IssuesReportBuilder.java @@ -0,0 +1,100 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.sonar.api.BatchExtension; +import org.sonar.api.issue.Issue; +import org.sonar.api.issue.internal.DefaultIssue; +import org.sonar.api.resources.Project; +import org.sonar.api.rule.RuleKey; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RuleFinder; +import org.sonar.api.rules.RulePriority; +import org.sonar.batch.ProjectTree; +import org.sonar.batch.index.BatchResource; +import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.issue.IssueCache; + +import javax.annotation.CheckForNull; + +public class IssuesReportBuilder implements BatchExtension { + + private static final Logger LOG = LoggerFactory.getLogger(IssuesReportBuilder.class); + + private final IssueCache issueCache; + private final RuleFinder ruleFinder; + private final ResourceCache resourceCache; + private final ProjectTree projectTree; + + public IssuesReportBuilder(IssueCache issueCache, RuleFinder ruleFinder, ResourceCache resourceCache, ProjectTree projectTree) { + this.issueCache = issueCache; + this.ruleFinder = ruleFinder; + this.resourceCache = resourceCache; + this.projectTree = projectTree; + } + + public IssuesReport buildReport() { + Project project = projectTree.getRootProject(); + IssuesReport issuesReport = new IssuesReport(); + issuesReport.setTitle(project.getName()); + issuesReport.setDate(project.getAnalysisDate()); + + processIssues(issuesReport, issueCache.all()); + + return issuesReport; + } + + private void processIssues(IssuesReport issuesReport, Iterable issues) { + for (Issue issue : issues) { + Rule rule = findRule(issue); + RulePriority severity = RulePriority.valueOf(issue.severity()); + BatchResource resource = resourceCache.get(issue.componentKey()); + if (!validate(issue, rule, resource)) { + continue; + } + if (issue.resolution() != null) { + issuesReport.addResolvedIssueOnResource(resource, issue, rule, severity); + } else { + issuesReport.addIssueOnResource(resource, issue, rule, severity); + } + } + } + + private boolean validate(Issue issue, Rule rule, BatchResource resource) { + if (rule == null) { + LOG.warn("Unknow rule for issue {}", issue); + return false; + } + if (resource == null) { + LOG.debug("Unknow resource with key {}", issue.componentKey()); + return false; + } + return true; + } + + @CheckForNull + private Rule findRule(Issue issue) { + RuleKey ruleKey = issue.ruleKey(); + return ruleFinder.findByKey(ruleKey); + } + +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java new file mode 100644 index 00000000000..99549c2ac1d --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportRuleKey.java @@ -0,0 +1,83 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RulePriority; + +/** + * A same rule can be present with different severity if severity was manually changed so we need this special key that + * include severity. + * + */ +public class ReportRuleKey implements Comparable { + private final Rule rule; + private final RulePriority severity; + + public ReportRuleKey(Rule rule, RulePriority severity) { + this.rule = rule; + this.severity = severity; + } + + public Rule getRule() { + return rule; + } + + public RulePriority getSeverity() { + return severity; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ReportRuleKey that = (ReportRuleKey) o; + return ObjectUtils.equals(rule, that.rule) && ObjectUtils.equals(severity, that.severity); + } + + @Override + public int hashCode() { + int result = rule.hashCode(); + result = 31 * result + severity.hashCode(); + return result; + } + + @Override + public int compareTo(ReportRuleKey o) { + if (severity == o.getSeverity()) { + return getRule().ruleKey().toString().compareTo(o.getRule().ruleKey().toString()); + } + return o.getSeverity().compareTo(severity); + } + + @Override + public String toString() { + return new ToStringBuilder(this). + append("rule", rule). + append("severity", severity). + toString(); + } +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java new file mode 100644 index 00000000000..192d8f0d9d1 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ReportSummary.java @@ -0,0 +1,96 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import com.google.common.collect.Maps; +import org.sonar.api.issue.Issue; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RulePriority; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +public class ReportSummary { + + private final IssueVariation total = new IssueVariation(); + + private final Map ruleReportByRuleKey = Maps.newHashMap(); + private final Map totalByRuleKey = Maps.newHashMap(); + private final Map totalBySeverity = Maps.newHashMap(); + + public ReportSummary() { + } + + public IssueVariation getTotal() { + return total; + } + + public void addIssue(Issue issue, Rule rule, RulePriority severity) { + ReportRuleKey reportRuleKey = new ReportRuleKey(rule, severity); + initMaps(reportRuleKey); + ruleReportByRuleKey.get(reportRuleKey).getTotal().incrementCountInCurrentAnalysis(); + total.incrementCountInCurrentAnalysis(); + totalByRuleKey.get(rule.ruleKey().toString()).incrementCountInCurrentAnalysis(); + totalBySeverity.get(severity.toString()).incrementCountInCurrentAnalysis(); + if (issue.isNew()) { + total.incrementNewIssuesCount(); + ruleReportByRuleKey.get(reportRuleKey).getTotal().incrementNewIssuesCount(); + totalByRuleKey.get(rule.ruleKey().toString()).incrementNewIssuesCount(); + totalBySeverity.get(severity.toString()).incrementNewIssuesCount(); + } + } + + public Map getTotalBySeverity() { + return totalBySeverity; + } + + public Map getTotalByRuleKey() { + return totalByRuleKey; + } + + public void addResolvedIssue(Issue issue, Rule rule, RulePriority severity) { + ReportRuleKey reportRuleKey = new ReportRuleKey(rule, severity); + initMaps(reportRuleKey); + total.incrementResolvedIssuesCount(); + ruleReportByRuleKey.get(reportRuleKey).getTotal().incrementResolvedIssuesCount(); + totalByRuleKey.get(rule.ruleKey().toString()).incrementResolvedIssuesCount(); + totalBySeverity.get(severity.toString()).incrementResolvedIssuesCount(); + } + + private void initMaps(ReportRuleKey reportRuleKey) { + if (!ruleReportByRuleKey.containsKey(reportRuleKey)) { + ruleReportByRuleKey.put(reportRuleKey, new RuleReport(reportRuleKey)); + } + if (!totalByRuleKey.containsKey(reportRuleKey.getRule().ruleKey().toString())) { + totalByRuleKey.put(reportRuleKey.getRule().ruleKey().toString(), new IssueVariation()); + } + if (!totalBySeverity.containsKey(reportRuleKey.getSeverity().toString())) { + totalBySeverity.put(reportRuleKey.getSeverity().toString(), new IssueVariation()); + } + } + + public List getRuleReports() { + List result = new ArrayList(ruleReportByRuleKey.values()); + Collections.sort(result, new RuleReportComparator()); + return result; + } +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/ResourceReport.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ResourceReport.java new file mode 100644 index 00000000000..18e135f278a --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/ResourceReport.java @@ -0,0 +1,153 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import com.google.common.collect.Maps; +import org.apache.commons.collections.CollectionUtils; +import org.sonar.api.issue.Issue; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RulePriority; +import org.sonar.batch.index.BatchResource; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +public final class ResourceReport { + private final BatchResource resource; + private final IssueVariation total = new IssueVariation(); + private final Map ruleReportByRuleKey = Maps.newHashMap(); + + private List issues = new ArrayList(); + private Map> issuesPerLine = Maps.newHashMap(); + private Map> newIssuesPerLine = Maps.newHashMap(); + private Map issuesByRule = Maps.newHashMap(); + private Map issuesBySeverity = Maps.newHashMap(); + + public ResourceReport(BatchResource resource) { + this.resource = resource; + } + + public BatchResource getResourceNode() { + return resource; + } + + public String getName() { + return resource.resource().getName(); + } + + public String getType() { + return resource.resource().getScope(); + } + + public IssueVariation getTotal() { + return total; + } + + public List getIssues() { + return issues; + } + + public Map> getIssuesPerLine() { + return issuesPerLine; + } + + public List getIssuesAtLine(int lineId, boolean all) { + if (all) { + if (issuesPerLine.containsKey(lineId)) { + return issuesPerLine.get(lineId); + } + } else if (newIssuesPerLine.containsKey(lineId)) { + return newIssuesPerLine.get(lineId); + } + return Collections.emptyList(); + } + + public void addIssue(Issue issue, Rule rule, RulePriority severity) { + ReportRuleKey reportRuleKey = new ReportRuleKey(rule, severity); + initMaps(reportRuleKey); + issues.add(issue); + Integer line = issue.line(); + line = line != null ? line : 0; + if (!issuesPerLine.containsKey(line)) { + issuesPerLine.put(line, new ArrayList()); + } + issuesPerLine.get(line).add(issue); + if (!issuesByRule.containsKey(rule)) { + issuesByRule.put(rule, new AtomicInteger()); + } + issuesByRule.get(rule).incrementAndGet(); + if (!issuesBySeverity.containsKey(severity)) { + issuesBySeverity.put(severity, new AtomicInteger()); + } + issuesBySeverity.get(severity).incrementAndGet(); + ruleReportByRuleKey.get(reportRuleKey).getTotal().incrementCountInCurrentAnalysis(); + total.incrementCountInCurrentAnalysis(); + if (issue.isNew()) { + if (!newIssuesPerLine.containsKey(line)) { + newIssuesPerLine.put(line, new ArrayList()); + } + newIssuesPerLine.get(line).add(issue); + total.incrementNewIssuesCount(); + ruleReportByRuleKey.get(reportRuleKey).getTotal().incrementNewIssuesCount(); + } + } + + public void addResolvedIssue(Issue issue, Rule rule, RulePriority severity) { + ReportRuleKey reportRuleKey = new ReportRuleKey(rule, severity); + initMaps(reportRuleKey); + total.incrementResolvedIssuesCount(); + ruleReportByRuleKey.get(reportRuleKey).getTotal().incrementResolvedIssuesCount(); + } + + private void initMaps(ReportRuleKey reportRuleKey) { + if (!ruleReportByRuleKey.containsKey(reportRuleKey)) { + ruleReportByRuleKey.put(reportRuleKey, new RuleReport(reportRuleKey)); + } + } + + public boolean isDisplayableLine(Integer lineNumber, boolean all) { + if (lineNumber == null || lineNumber < 1) { + return false; + } + for (int i = lineNumber - 2; i <= lineNumber + 2; i++) { + if (hasIssues(i, all)) { + return true; + } + } + return false; + } + + private boolean hasIssues(Integer lineId, boolean all) { + if (all) { + return CollectionUtils.isNotEmpty(issuesPerLine.get(lineId)); + } + return CollectionUtils.isNotEmpty(newIssuesPerLine.get(lineId)); + } + + public List getRuleReports() { + List result = new ArrayList(ruleReportByRuleKey.values()); + Collections.sort(result, new RuleReportComparator()); + return result; + } + +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java new file mode 100644 index 00000000000..80b3ea91fc8 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleNameProvider.java @@ -0,0 +1,58 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import org.apache.commons.lang.StringEscapeUtils; +import org.sonar.api.BatchComponent; +import org.sonar.api.rule.RuleKey; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RuleFinder; + +import javax.annotation.CheckForNull; + +public class RuleNameProvider implements BatchComponent { + private RuleFinder ruleFinder; + + public RuleNameProvider(RuleFinder ruleFinder) { + this.ruleFinder = ruleFinder; + } + + @CheckForNull + private String nameFromDB(RuleKey ruleKey) { + Rule r = ruleFinder.findByKey(ruleKey); + return r != null ? r.getName() : null; + } + + public String nameForHTML(RuleKey ruleKey) { + String name = nameFromDB(ruleKey); + return StringEscapeUtils.escapeHtml(name != null ? name : ruleKey.toString()); + } + + public String nameForJS(String ruleKey) { + String name = nameFromDB(RuleKey.parse(ruleKey)); + return StringEscapeUtils.escapeJavaScript(name != null ? name : ruleKey.toString()); + } + + public String nameForHTML(Rule rule) { + String name = nameFromDB(RuleKey.of(rule.getRepositoryKey(), rule.getKey())); + return StringEscapeUtils.escapeHtml(name != null ? name : rule.getName()); + } + +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReport.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReport.java new file mode 100644 index 00000000000..1ddf1b38282 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReport.java @@ -0,0 +1,56 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import org.apache.commons.lang.builder.ToStringBuilder; +import org.sonar.api.rules.Rule; + +public final class RuleReport { + private final ReportRuleKey reportRuleKey; + private final IssueVariation total = new IssueVariation(); + + public RuleReport(ReportRuleKey reportRuleKey) { + this.reportRuleKey = reportRuleKey; + } + + public IssueVariation getTotal() { + return total; + } + + public ReportRuleKey getReportRuleKey() { + return reportRuleKey; + } + + public String getSeverity() { + return reportRuleKey.getSeverity().toString(); + } + + public Rule getRule() { + return reportRuleKey.getRule(); + } + + @Override + public String toString() { + return new ToStringBuilder(this). + append("reportRuleKey", reportRuleKey). + append("total", total). + toString(); + } +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java new file mode 100644 index 00000000000..e4a9c06f8b8 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/RuleReportComparator.java @@ -0,0 +1,64 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import java.io.Serializable; +import java.util.Comparator; + +public class RuleReportComparator implements Comparator, Serializable { + @Override + public int compare(RuleReport o1, RuleReport o2) { + if (bothHaveNoNewIssue(o1, o2)) { + return compareByRuleSeverityAndName(o1, o2); + } else if (bothHaveNewIssues(o1, o2)) { + if (sameSeverity(o1, o2) && !sameNewIssueCount(o1, o2)) { + return compareNewIssueCount(o1, o2); + } else { + return compareByRuleSeverityAndName(o1, o2); + } + } else { + return compareNewIssueCount(o1, o2); + } + } + + private int compareByRuleSeverityAndName(RuleReport o1, RuleReport o2) { + return o1.getReportRuleKey().compareTo(o2.getReportRuleKey()); + } + + private boolean sameNewIssueCount(RuleReport o1, RuleReport o2) { + return o2.getTotal().getNewIssuesCount() == o1.getTotal().getNewIssuesCount(); + } + + private boolean sameSeverity(RuleReport o1, RuleReport o2) { + return o1.getSeverity().equals(o2.getSeverity()); + } + + private int compareNewIssueCount(RuleReport o1, RuleReport o2) { + return o2.getTotal().getNewIssuesCount() - o1.getTotal().getNewIssuesCount(); + } + + private boolean bothHaveNewIssues(RuleReport o1, RuleReport o2) { + return o1.getTotal().getNewIssuesCount() > 0 && o2.getTotal().getNewIssuesCount() > 0; + } + + private boolean bothHaveNoNewIssue(RuleReport o1, RuleReport o2) { + return o1.getTotal().getNewIssuesCount() == 0 && o2.getTotal().getNewIssuesCount() == 0; + } +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/report/SourceProvider.java b/sonar-batch/src/main/java/org/sonar/batch/scan/report/SourceProvider.java new file mode 100644 index 00000000000..264a7202386 --- /dev/null +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/report/SourceProvider.java @@ -0,0 +1,66 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.scan.report; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.sonar.api.BatchComponent; +import org.sonar.api.batch.fs.FileSystem; +import org.sonar.api.batch.fs.InputFile; +import org.sonar.batch.index.BatchResource; +import org.sonar.batch.scan.filesystem.InputPathCache; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class SourceProvider implements BatchComponent { + + private static final Logger LOG = LoggerFactory.getLogger(SourceProvider.class); + private final InputPathCache inputPathCache; + private final FileSystem fs; + + public SourceProvider(InputPathCache inputPathCache, FileSystem fs) { + this.inputPathCache = inputPathCache; + this.fs = fs; + } + + public List getEscapedSource(BatchResource component) { + if (!component.isFile()) { + // Folder + return Collections.emptyList(); + } + try { + InputFile inputFile = (InputFile) inputPathCache.getInputPath(component); + List lines = FileUtils.readLines(inputFile.file(), fs.encoding()); + List escapedLines = new ArrayList(lines.size()); + for (String line : lines) { + escapedLines.add(StringEscapeUtils.escapeHtml(line)); + } + return escapedLines; + } catch (IOException e) { + LOG.warn("Unable to read source code of resource {}", component, e); + return Collections.emptyList(); + } + } +} diff --git a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmSensor.java b/sonar-batch/src/main/java/org/sonar/batch/scm/ScmSensor.java index fc42a20e18c..77fcd34cb20 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmSensor.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scm/ScmSensor.java @@ -34,7 +34,7 @@ import org.sonar.api.batch.sensor.measure.internal.DefaultMeasure; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.utils.TimeProfiler; import org.sonar.batch.protocol.input.FileData; -import org.sonar.batch.protocol.input.ProjectRepository; +import org.sonar.batch.protocol.input.ProjectRepositories; import org.sonar.core.DryRunIncompatible; import java.util.LinkedList; @@ -48,10 +48,10 @@ public final class ScmSensor implements Sensor { private final ProjectDefinition projectDefinition; private final ScmConfiguration configuration; private final FileSystem fs; - private final ProjectRepository projectReferentials; + private final ProjectRepositories projectReferentials; public ScmSensor(ProjectDefinition projectDefinition, ScmConfiguration configuration, - ProjectRepository projectReferentials, FileSystem fs) { + ProjectRepositories projectReferentials, FileSystem fs) { this.projectDefinition = projectDefinition; this.configuration = configuration; this.projectReferentials = projectReferentials; diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl b/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl new file mode 100644 index 00000000000..2c4be6a86c8 --- /dev/null +++ b/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport.ftl @@ -0,0 +1,456 @@ + + + + + Issues report of ${report.getTitle()} + + + + + + +
+ +
Issues Report
+
${report.getTitle()} - ${report.getDate()?datetime}
+
+ +
+ + <#if !complete> + + + +
+ + + + <#if complete> + <#assign size = '33'> + <#else> + <#assign size = '50'> + + + + <#if complete> + + + + +
+

New issues

+ <#if report.getSummary().getTotal().getNewIssuesCount() gt 0> + ${report.getSummary().getTotal().getNewIssuesCount()?c} + <#else> + 0 + + 		+

Resolved issues

+ <#if report.getSummary().getTotal().getResolvedIssuesCount() gt 0> + ${report.getSummary().getTotal().getResolvedIssuesCount()?c} + <#else> + 0 + + 		+

Issues

+ ${report.getSummary().getTotal().getCountInCurrentAnalysis()?c} +
+ <#if complete> +
+ + + + + + + + + + + <#list report.getSummary().getRuleReports() as ruleReport> + <#if complete || (ruleReport.getTotal().getNewIssuesCount() > 0)> + <#if ruleReport.getTotal().getNewIssuesCount() = 0> + <#assign trCss = 'all'> + <#else> + <#assign trCss = ''> + + + + + + + + + + + +
+ Issues per Rule + New issuesResolved issuesIssues
+ + + ${ruleNameProvider.nameForHTML(ruleReport.getRule())} + + <#if ruleReport.getTotal().getNewIssuesCount() gt 0> + ${ruleReport.getTotal().getNewIssuesCount()?c} + <#else> + 0 + + + <#if ruleReport.getTotal().getResolvedIssuesCount() gt 0> + ${ruleReport.getTotal().getResolvedIssuesCount()?c} + <#else> + 0 + + + ${ruleReport.getTotal().getCountInCurrentAnalysis()?c} +
+ +
+ +
+ + + +
+ <#list report.getResourceReports() as resourceReport> + <#if complete || (resourceReport.getTotal().getNewIssuesCount() > 0)> + <#assign issueId=0> + <#if resourceReport.getTotal().getNewIssuesCount() = 0> + <#assign tableCss = 'all'> + <#else> + <#assign tableCss = ''> + + + + + + + <#if complete> + + + + + + + <#if complete> + <#list resourceReport.getRuleReports() as ruleReport> + + + + + <#if complete> + + + + + + + <#if complete> + <#assign colspan = '5'> + <#else> + <#assign colspan = '3'> + + <#assign issues=resourceReport.getIssuesAtLine(0, complete)> + <#if issues?has_content> + + + + + + + + +
+
+ + ${resourceReport.getName()} +
+ 		+ <#if resourceReport.getTotal().getNewIssuesCount() gt 0> + ${resourceReport.getTotal().getNewIssuesCount()?c} + <#else> + 0 + +
New issues + 		+ <#if resourceReport.getTotal().getResolvedIssuesCount() gt 0> + ${resourceReport.getTotal().getResolvedIssuesCount()?c} + <#else> + 0 + +
Resolved issues + 		+ ${resourceReport.getTotal().getCountInCurrentAnalysis()?c}
Issues +
+ + + ${ruleNameProvider.nameForHTML(ruleReport.getRule())} + + <#if ruleReport.getTotal().getNewIssuesCount() gt 0> + ${ruleReport.getTotal().getNewIssuesCount()?c} + <#else> + 0 + + + <#if ruleReport.getTotal().getResolvedIssuesCount() gt 0> + ${ruleReport.getTotal().getResolvedIssuesCount()?c} + <#else> + 0 + + + ${ruleReport.getTotal().getCountInCurrentAnalysis()?c} +
+ <#list issues as issue> +
+
+ + <#if issue.message()??> + ${issue.message()} + <#else> + ${ruleNameProvider.nameForHTML(issue.ruleKey())} + +   +   + + + <#if issue.isNew()> + NEW + <#else> + <#if issue.creationDate()??>${issue.creationDate()?date}<#else>TODO (no date) + + +
+
+ ${ruleNameProvider.nameForHTML(issue.ruleKey())} +
+
+ <#assign issueId = issueId + 1> + +
+ + <#list sourceProvider.getEscapedSource(resourceReport.getResourceNode()) as line> + <#assign lineIndex=line_index+1> + <#if resourceReport.isDisplayableLine(lineIndex, complete)> + + + + + + + + <#assign issues=resourceReport.getIssuesAtLine(lineIndex, complete)> + <#if issues?has_content> + + + + + + + +
${lineIndex?c} + 
${line}
+
+ <#list issues as issue> +
+
+ + <#if issue.message()??> + ${issue.message()} + <#else> + ${ruleNameProvider.nameForHTML(issue.ruleKey())} + +   +   + + + <#if issue.isNew()> + NEW + <#else> + <#if issue.creationDate()??>${issue.creationDate()?date}<#else>TODO (no date) + + +   + +
+
+ ${ruleNameProvider.nameForHTML(issue.ruleKey())} +
+
+ <#assign issueId = issueId + 1> + +
+
+ + +
+
+ + + diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png b/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/DIR.png new file mode 100644 index 0000000000000000000000000000000000000000..b135ef92eec475ae36f421425b852ff3eb339b1e GIT binary patch literal 390 zcmV;10eSw3P)D;i>g+kXb7A zAt@;}b=`J;Ib*xx2Z$JSco^n|=b2$(H~?HP^dz%@O_;LtZl5ZMyB2g$u?fzRzWz~; zVhZNooN>G;t83u`ZZk#;{IWmM?$pM>qO8sxMKQm1iJ8p{OnT2TzOFFFHUi*XQk-|m zadUMnNQ{B$ZKoBWH^`R_lyrh(g`iL+rxARX2|h{$*&@Mff#5kukjNTPk{TvFzGOq- z?Ta9iHY~!aZ?*;>bOfp>2_2{L3Ql4bh-azRK!yfhYGUX~uZ#C}@mSSxaHBN^L^(D=@UO?;ZB| klif17bU6Drf8pN)Kje1&o&U^8g8%>k07*qoM6N<$f&iYU3;+NC literal 0 HcmV?d00001 diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png b/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/FIL.png new file mode 100644 index 0000000000000000000000000000000000000000..1664e25c8b50160089710e75cc105b218bbd1e49 GIT binary patch literal 416 zcmV;R0bl-!P)V{QECN z^Isq*BUP8-56Hm33=G1&%nZ5JM;P&X;V)2Q`SeR*zkm$+55^2&dQzSN1HnK9dAlJ= z8y*fI@B9T4fB!*TM1%qV8ER);2HW@#$@c$1gC-Uj5;g#2OI5r!(BJ>ThW-7EaLFHH zTmVwoI2RTM2-`t)Kd~+-iGhRxJUahD0vDPr2#0~B04qE}fx`ftEg&w!YrvgH4`208 z-SF+px4#U3e*XohL{J#~{sW25kDtH&5fNqjhSPv;3rlrL&CURrVDUeLPi`#$0000< KMNUMnLSTaHU$YSa literal 0 HcmV?d00001 diff --git a/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png b/sonar-batch/src/main/resources/org/sonar/batch/scan/report/issuesreport_files/PRJ.png new file mode 100644 index 0000000000000000000000000000000000000000..b32e51c5f42a15a7b1223e3b66e53c87cb986e45 GIT binary patch literal 575 zcmV-F0>J%=P)(o*%)Aj(A$XSu?(=)j;T(^uvYF=t2wojnb}Oo0fYIl} zHRDh3FKq|_a5Hq$58(4c--B8Fdn&$m500?CbhjCPHoa)mhIBlQH5Mo3kclqn$l#4i z-|t{W6|S{EBI5{Ki@bbaaWF)DHHQxcUd$QRK1ayJ)5K!yq*v#@{9zypB3V#t^Kn=4 zV#^qBhsL;9OF*^Bp=^@!m%E# z6*s^ISW$W&FA_@{M8R6c=78k!2EgYh#(sZ_sIhBl);M9d~XU-b%)z^?f?o{D>xY`1Xxi{*YBn0!)rv9(Any2 zE0X`*&{2XP!n-o2Uez8V`}N+f=of)*~E zsHF4m3|5rOXZ9hvRMBhz5N&Lz+tt`mS74yGx*jgq?GNlsBr`rE>b>4Sh2+vzpyPb) zzgIcjda68McsV)0EP}rySew(&FPZ-T7V<9=S@B&7^{j668auD6usVgB4NA_=dW4O9BVSq5jcH zUS{Uad%yYEnK!>#hDl+rU=}W9AWvtWox?Dz8HPzuzfk`W^d8XN20AE$#RWZN3S`5j7_2A5z#NRYKK?`s)(f5)|=^iTcyA>k7JEb=mK8IN&2r zBZb^tG5GHaJM1fU!T!!PT$y%9#`T(jbiEuc)+Ah_JJJ2q@mB?QUr1n|35dD3sxqph zz7dD*x_B60ys++SO<+G#1te2j82`t9C%ak|xqA!+ub<4H+UO!`hVS({wSzJ2Rwee4 z_WI(vp!fM*nWfwD+FIRNjixxxQ&ubFet2()YQC|@`RhfIx>PyRpWM5)Pg-c9* zsEl3F>O(b#gr8Gi=B^EhYvyZmj$2c5)|obw<(;r@*8M@}s(QGklldgtMhL@<${^%a zXuTigEJzQ?0gyWxW~7s0hM=sy#4zWn{vSUYXVO6mL1;W0O*HUaPXF2pz_&<&{c*!o z&g5(is#~xv2urAs#+KQ@kB6ylkL+5bf)u zZcHFX7sa!kjrIVnd(_R5h+tbj8~E`sRRJG{d#RJu7hf6AHreg;elgtKAlxrIl8rqT zJWXLYe7iG`05`dp+S9wHLCl>$72jmos3Hz(5__t>IAbow(vTr&EY2!nD;h_(I` zmHeM@=CY_AP>~dPSG1@idvGGZWa*v;cZDvq-vCDrMSy>seFOy@guAfZtj{F>%E{)pdT~crbsjzEub5a(j>0)%2_Fc1 z@EJIV%S?U9!#)LPpp(WyQTPdOh{xOFm=<-!!G+uLqc0)3hwKyf;lVr{ZAYh=SRzi%&DzjuJ4F5d+e;y z^#}f=(>LOD`lRm@_@=8so`yH(e#&F$oFfW%Fd(A4tyq3|w;uCxKej0R$uHlsXIR@b z8SM#5NbPYHUSrjdFVi^DRh6fNBvb=^9#UoYG|YvxZwLM+qqA_AR6!i&t$vLVZ(#q` zz?mm4@V5JW+}jWK`fg1`Cz~Ahu{W62-&%&dX=^v^C0$_qp|9g%H&+j9ToRLUVco{8 zc~;v)WoT6h-it9W-w%7ByQPAE$l6ZlstNYJfb(_4mp3KuLw)=^GgI5-ta?70sk1>_8#lsBBId_CB@Y<Z zhCu$RC1jw9klq49Vx@$<_ZlI~ddbM{FaOI)#n@6wi+9vv)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.parentWindow;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.frameElement&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ct(function(e){return e.innerHTML="",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="
",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
t
",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null) +}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); + u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("