changed String that is being used for trackPageview method

drseb · Aug 29, 2015 · 64a8e27 · 64a8e27
1 parent 74f799b
commit 64a8e27
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/src/hpoweb/HpowebUI.java b/src/hpoweb/HpowebUI.java
@@ -100,7 +100,7 @@ protected void init(VaadinRequest request) {
  addExtension(tracker);
  tracker.extend(UI.getCurrent());
  tracker.extend(this);
- tracker.trackPageview(Page.getCurrent().toString());
+ tracker.trackPageview(Page.getCurrent().getLocation().toString());
 
  if (parameterMap.containsKey(CONSTANTS.hpRequestId)) {
 
@@ -113,13 +113,11 @@ protected void init(VaadinRequest request) {
 
  if (doParseHpo) {
  dataProvider = new HpClassDataProvider(hpClass, hpData);
- }
- else {
+ } else {
  dataProvider = new FakeHpClassDataProvider();
  }
 
- }
- else if (parameterMap.containsKey(CONSTANTS.geneRequestId)) {
+ } else if (parameterMap.containsKey(CONSTANTS.geneRequestId)) {
 
  Integer geneId = parseGeneId(request);
  if (geneId == null && doParseHpo) {
@@ -131,13 +129,11 @@ else if (parameterMap.containsKey(CONSTANTS.geneRequestId)) {
  if (doParseHpo) {
 
  dataProvider = new GeneDataProvider(geneId, hpData);
- }
- else {
+ } else {
  dataProvider = new FakeGeneDataProvider();
  }
 
- }
- else if (parameterMap.containsKey(CONSTANTS.diseaseRequestId)) {
+ } else if (parameterMap.containsKey(CONSTANTS.diseaseRequestId)) {
 
  DiseaseId diseaseId = parseDiseaseId(request);
  if (diseaseId == null && doParseHpo) {
@@ -149,12 +145,10 @@ else if (parameterMap.containsKey(CONSTANTS.diseaseRequestId)) {
  if (doParseHpo) {
 
  dataProvider = new DiseaseDataProvider(diseaseId, hpData);
- }
- else {
+ } else {
  dataProvider = new FakeDiseaseDataProvider();
  }
- }
- else {
+ } else {
  new Notification("Invalid URL", "<br/><br/>You have to provide one URL parameter (" + CONSTANTS.hpRequestId + ","
  + CONSTANTS.geneRequestId + ", or " + CONSTANTS.diseaseRequestId + ") ! ", Notification.Type.WARNING_MESSAGE, true).show(Page
  .getCurrent());
@@ -184,14 +178,12 @@ else if (parameterMap.containsKey(CONSTANTS.diseaseRequestId)) {
  HpoClassTabFactory hpoClassTabFactory = new HpoClassTabFactory(hpData);
  hpoClassTabFactory.addTermInfoTabs(sheet, (IHpClassDataProvider) dataProvider);
 
- }
- else if (dataProvider instanceof IDiseaseDataProvider) {
+ } else if (dataProvider instanceof IDiseaseDataProvider) {
 
  DiseaseTabFactory diseaseTabFactory = new DiseaseTabFactory(hpData);
  diseaseTabFactory.addDiseaseInfoTabs(sheet, (IDiseaseDataProvider) dataProvider);
 
- }
- else if (dataProvider instanceof IGeneDataProvider) {
+ } else if (dataProvider instanceof IGeneDataProvider) {
 
  GeneTabFactory geneTabFactory = new GeneTabFactory(hpData);
  geneTabFactory.addGeneInfoTabs(sheet, (IGeneDataProvider) dataProvider);