From ef3acbb60a3fb85842dfdb109bf6d8159b75e540 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 12 Sep 2012 12:49:47 +0000
Subject: [PATCH] SWE-2 / SP-263: Remove class name based id creation as GWT
obfuscates them when not in development mode.
SVN: 26613
---
.../application/ui/entity_type/AbstractEntityTypeGrid.java | 6 +++---
.../cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java | 6 +++---
.../cisd/openbis/uitest/page/tab/SampleTypeBrowser.java | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
index 42de1ad77c2..53c312224d4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
@@ -92,7 +92,7 @@ abstract public class AbstractEntityTypeGrid<T extends EntityType> extends Typed
createRegisterEntityTypeDialog(entityKind).show();
}
});
- button.setId("add-entity-type-" + this.getClass().getName());
+ button.setId("add-entity-type-" + getEntityKindOrNull());
addButton(button);
Button editButton =
@@ -110,10 +110,10 @@ abstract public class AbstractEntityTypeGrid<T extends EntityType> extends Typed
}
});
- editButton.setId("edit-entity-type-" + this.getClass().getName());
+ editButton.setId("edit-entity-type-" + getEntityKindOrNull());
addButton(editButton);
Button deleteButton = createDeleteButton(viewContext);
- deleteButton.setId("delete-entity-type-" + this.getClass().getName());
+ deleteButton.setId("delete-entity-type-" + getEntityKindOrNull());
enableButtonOnSelectedItems(deleteButton);
addButton(deleteButton);
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java
index 86c07652ece..963c594573d 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/ExperimentTypeBrowser.java
@@ -28,13 +28,13 @@ import ch.systemsx.cisd.openbis.uitest.page.dialog.AddExperimentTypeDialog;
public class ExperimentTypeBrowser extends BrowserPage
{
- @FindBy(id = "add-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ExperimentTypeGrid")
+ @FindBy(id = "add-entity-type-EXPERIMENT")
private WebElement addButton;
- @FindBy(id = "edit-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ExperimentTypeGrid")
+ @FindBy(id = "edit-entity-type-EXPERIMENT")
private WebElement editButton;
- @FindBy(id = "delete-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ExperimentTypeGrid")
+ @FindBy(id = "delete-entity-type-EXPERIMENT")
private WebElement deleteButton;
@FindBys(
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java
index aaf1c864f19..318aa7ace27 100644
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java
+++ b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/tab/SampleTypeBrowser.java
@@ -29,13 +29,13 @@ import ch.systemsx.cisd.openbis.uitest.type.SampleType;
public class SampleTypeBrowser extends BrowserPage
{
- @FindBy(id = "add-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleTypeGrid")
+ @FindBy(id = "add-entity-type-SAMPLE")
private WebElement addSampleTypeButton;
- @FindBy(id = "edit-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleTypeGrid")
+ @FindBy(id = "edit-entity-type-SAMPLE")
private WebElement editSampleTypeButton;
- @FindBy(id = "delete-entity-type-ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleTypeGrid")
+ @FindBy(id = "delete-entity-type-SAMPLE")
private WebElement deleteSampleTypeButton;
@FindBys(
--
GitLab