From 1ff519231ab4af47f6a01d2c16588b46bc4efa38 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 15 Apr 2020 02:29:37 +0200 Subject: [PATCH] removing obsolete (commented) code and empty lines --- .../TrackedRacesListComposite.java | 1 - .../tracking/TrackedRacesListPO.java | 63 +------------------ 2 files changed, 3 insertions(+), 61 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java index eb984f92d3e..5d068a2d7c1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java @@ -143,7 +143,6 @@ public class TrackedRacesListComposite extends AbstractTrackedRacesListComposite }); btnExport.setEnabled(false); trackedRacesButtonPanel.add(btnExport); - btnRemoveRace = new SelectedElementsCountingButton(stringMessages.remove(), refreshableSelectionModel, e -> e.getRegattaName() + " - " + e.getName(), diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesListPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesListPO.java index faa3e8c047d..9972ed74199 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesListPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/tracking/TrackedRacesListPO.java @@ -85,8 +85,6 @@ public class TrackedRacesListPO extends PageArea { @FindBy(how = BySeleniumId.class, using = "TrackedRacesFilterTextBox") private WebElement trackedRacesFilterTextBox; - //@FindBy(how = BySeleniumId.class, using = "NoTrackedRacesLabel") - @FindBy(how = BySeleniumId.class, using = "TrackedRacesCellTable") private WebElement trackedRacesTable; @@ -105,8 +103,6 @@ public class TrackedRacesListPO extends PageArea { @FindBy(how = BySeleniumId.class, using = "ExportButton") private WebElement exportButton; - //@FindBy(how = BySeleniumId.class, using = "ExportPopup") - public TrackedRacesListPO(WebDriver driver, WebElement element) { super(driver, element); } @@ -117,41 +113,18 @@ public class TrackedRacesListPO extends PageArea { } public List getTrackedRaces() { -// List descriptors = new LinkedList<>(); CellTablePO table = getTrackedRacesTable(); - -// for(DataEntryPO entry : table.getEntries()) { -// String regatta = entry.getColumnContent(0); -// String boatClass = entry.getColumnContent(1); -// String race = entry.getColumnContent(2); -// -// descriptors.add(new TrackedRaceDescriptor(regatta, boatClass, race)); -// } - return table.getEntries(); } -// public WebElement getTrackedRace(String regatta, String race) { -// for (WebElement raceRow : getTrackedRaces()) { -// List fields = raceRow.findElements(By.tagName("td")); -// if (regattaName.equals(fields.get(0).getText()) && raceName.equals(fields.get(2).getText())) { -// return raceRow; -// } -// } -// return null; -// } - public Status getStatus(TrackedRaceDescriptor race) { List status = getStatus(Arrays.asList(race)); - return status.get(0); } public List getStatus(List races) { List result = new ArrayList<>(Collections.nCopies(races.size(), null)); - CellTablePO table = getTrackedRacesTable(); - final int regattaColumnIndex = table.getColumnIndex("Regatta"); final int boatClassColumnIndex = table.getColumnIndex("Boat Class"); final int raceColumnIndex = table.getColumnIndex("Race"); @@ -161,14 +134,11 @@ public class TrackedRacesListPO extends PageArea { String boatClass = entry.getColumnContent(boatClassColumnIndex); String race = entry.getColumnContent(raceColumnIndex); String status = entry.getColumnContent(statusColumnIndex); - TrackedRaceDescriptor descriptor = new TrackedRaceDescriptor(regatta, boatClass, race); - if(races.contains(descriptor)) { result.set(races.indexOf(descriptor), Status.fromString(status)); } } - return result; } @@ -194,25 +164,21 @@ public class TrackedRacesListPO extends PageArea { public void remove(List races) { selectRaces(races); - removeSelectedTrackedRacesAndWaitForAjaxRequests(); } public void removeAll() { getTrackedRacesTable().selectAllEntries(); - removeSelectedTrackedRacesAndWaitForAjaxRequests(); } private void removeSelectedTrackedRacesAndWaitForAjaxRequests() { this.removeButton.click(); - waitForAjaxRequests(); } public void refresh() { this.refreshButton.click(); - waitForAjaxRequests(); } @@ -249,60 +215,37 @@ public class TrackedRacesListPO extends PageArea { }); } -// public void waitForTrackedRaceLoadingFinished(String regattaName, String raceName, long timeoutInMillis) throws InterruptedException { -// waitForAjaxRequests(); // wait for the Start Tracking request to succeed; then check Tracked races table and keep refreshing until we time out -// TrackedRacesPanel trp = getTrackedRacesPanel(); -// long started = System.currentTimeMillis(); -// WebElement raceRow = trp.getTrackedRace(regattaName, raceName); -// while ((raceRow == null || !"TRACKING".equals(raceRow.findElements(By.tagName("td")).get(6).getText())) -// && System.currentTimeMillis()-started < timeoutInMillis) { -// Thread.sleep(2000); // wait 2s for the race to appear -// trp.refresh(); -// raceRow = trp.getTrackedRace(regattaName, raceName); -// } -// } - public void stopTracking(List races, boolean waitForFinished) { selectRaces(races); this.stopTrackingButton.click(); waitForAjaxRequests(); - if(waitForFinished) { + if (waitForFinished) { waitForTrackedRaces(races, Status.FINISHED); } } public CellTablePO getTrackedRacesTable() { -// if(!this.trackedRacesTable.isDisplayed()) { -// return null; -// } - return new GenericCellTablePO<>(this.driver, this.trackedRacesTable, DataEntryPO.class); } private List getTrackedRaces(List races) { List result = new ArrayList<>(Collections.nCopies(races.size(), null)); - CellTablePO table = getTrackedRacesTable(); List rows = table.getEntries(); Iterator iterator = rows.iterator(); - final int regattaColumnIndex = table.getColumnIndex("Regatta"); final int boatClassColumnIndex = table.getColumnIndex("Boat Class"); final int raceColumnIndex = table.getColumnIndex("Race"); - while(iterator.hasNext()) { + while (iterator.hasNext()) { DataEntryPO entry = iterator.next(); - String regatta = entry.getColumnContent(regattaColumnIndex); String boatClass = entry.getColumnContent(boatClassColumnIndex); String race = entry.getColumnContent(raceColumnIndex); - TrackedRaceDescriptor descriptor = new TrackedRaceDescriptor(regatta, boatClass, race); - - if(races.contains(descriptor)) { + if (races.contains(descriptor)) { result.set(races.indexOf(descriptor), entry); } } - return result; }