Skip to content

WIP Fix #123 and potenitally others: Rename methods returning lists to use plural names #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdruskat wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

WIP Fix #123 and potenitally others: Rename methods returning lists to use plural names #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions salt-api/src/main/java/org/corpus_tools/salt/core/SGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,18 @@ public void traverse(List<? extends SNode> startNodes, GRAPH_TRAVERSE_TYPE trave
* @param layerName
* Name of the layer to search for
* @return A complete list of all matching layers. Is never null.
* @deprecated Use {@link #getLayersByName(String)}
*/
@Deprecated
public List<SLayer> getLayerByName(String layerName);

/**
* Searches for a layer or a set of layers having the given layer name.
*
* @param layerName
* Name of the layer to search for
* @return A complete list of all matching layers. Is never null.
*/
public List<SLayer> getLayersByName(String layerName);

}
20 changes: 20 additions & 0 deletions salt-api/src/main/java/org/corpus_tools/salt/core/impl/SGraphImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public List<SRelation> getRelationsByName(String relationName) {

/** {@inheritDoc} **/
@Override
@Deprecated
public List<SLayer> getLayerByName(String layerName) {
if ((layerName == null) || (layerName.isEmpty())) {
return (null);
Expand All @@ -123,6 +124,25 @@ public List<SLayer> getLayerByName(String layerName) {
return result;
}

/** {@inheritDoc} **/
@Override
public List<SLayer> getLayersByName(String layerName) {
if ((layerName == null) || (layerName.isEmpty())) {
return (null);
}

List<SLayer> result = new ArrayList<>();
for (SLayer l : getLayers()) {
if ((l.getName() == null) || (l.getName().isEmpty())) {
break;
}
if (layerName.equals(l.getName())) {
result.add(l);
}
}
return result;
}

/** {@inheritDoc} */
@Override
public List<SNode> getRoots() {
Expand Down