From bcfd2531095c76e571aa8e32d92b51c4ed48479e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 30 Sep 2014 06:02:04 +0000
Subject: [PATCH] SSDM-949: Rename attribute (and getter and setters)
positionInSequence to position.
SVN: 32528
---
.../api/v2/sequencedatabases/BlastDatabase.java | 2 +-
.../api/v2/sequencedatabases/EchoDatabase.java | 2 +-
.../generic/server/business/bo/DataSetTableTest.java | 2 +-
.../api/v1/dto/DataSetFileSearchResultLocation.java | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java
index 3962823f048..4ef51b0804f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java
@@ -164,7 +164,7 @@ public class BlastDatabase extends AbstractSearchDomainService
resultLocation.setIdentifier(matcher.group(1));
resultLocation.setDataSetCode(matcher.group(2));
resultLocation.setPathInDataSet(matcher.group(3));
- resultLocation.setPositionInSequence(parse(row[1]));
+ resultLocation.setPosition(parse(row[1]));
sequenceSearchResult.setResultLocation(resultLocation);
result.add(sequenceSearchResult);
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java
index 78ac28686c5..9de1c6d0ed7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java
@@ -109,7 +109,7 @@ public class EchoDatabase extends AbstractSearchDomainService
public void setPositionInSequence(int position)
{
- resultLoacation.setPositionInSequence(position);
+ resultLoacation.setPosition(position);
}
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.java
index 5fb25833a24..54bf94d6d48 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.java
@@ -242,7 +242,7 @@ public final class DataSetTableTest extends AbstractBOTest
DataSetFileSearchResultLocation resultLocation = new DataSetFileSearchResultLocation();
resultLocation.setDataSetCode(foundDataSet);
resultLocation.setPathInDataSet(foundDataSet + "/path");
- resultLocation.setPositionInSequence(42);
+ resultLocation.setPosition(42);
resultLocation.setIdentifier("id-" + foundDataSet);
result.setResultLocation(resultLocation);
results.add(result);
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.java
index 85b1192fd4e..9783423f494 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.java
@@ -34,7 +34,7 @@ public class DataSetFileSearchResultLocation implements ISearchDomainResultLocat
private String identifier;
- private int positionInSequence;
+ private int position;
public String getDataSetCode()
{
@@ -66,21 +66,21 @@ public class DataSetFileSearchResultLocation implements ISearchDomainResultLocat
this.identifier = sequenceIdentifier;
}
- public int getPositionInSequence()
+ public int getPosition()
{
- return positionInSequence;
+ return position;
}
- public void setPositionInSequence(int positionInSequence)
+ public void setPosition(int positionInSequence)
{
- this.positionInSequence = positionInSequence;
+ this.position = positionInSequence;
}
@Override
public String toString()
{
return "Data set: " + dataSetCode + ", path: " + pathInDataSet
- + ", identifier: [" + identifier + "], position: " + positionInSequence;
+ + ", identifier: [" + identifier + "], position: " + position;
}
--
GitLab