Skip to content
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.

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

Allow named params to match with param enums in get() #285

Merged
merged 2 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/org/arl/fjage/param/NamedParameter.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public String toString() {
}

/**
* Compares if two named parameters are equals.
* Compares if two named parameters are equal.
*
* @return true if two parameters are equal
*/
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/arl/fjage/param/Parameter.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,11 @@ public interface Parameter {
*/
public int ordinal();

/**
* Gets the parameter name.
*
* @return unqualified parameter name
*/
public String name();
mchitre marked this conversation as resolved.
Show resolved Hide resolved

}
23 changes: 22 additions & 1 deletion src/main/java/org/arl/fjage/param/ParameterRsp.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ public void set(Parameter param, Object value, boolean readonly) {
* @return value of requested parameter
*/
public Object get(Parameter param) {
if (this.param == null) return null;
if (this.param == null || param == null) return null;
param = resolve(param);
Object rv = null;
if (this.param.equals(param)) {
if (value == null) return null;
Expand All @@ -112,6 +113,8 @@ public Object get(Parameter param) {
* @return true if parameter is read-only, false if read-write
*/
public boolean isReadonly(Parameter param) {
if (param == null) return false;
param = resolve(param);
return readonly.contains(param);
}

Expand Down Expand Up @@ -139,6 +142,24 @@ public Map<Parameter, Object> getParameters() {
return map;
}

/**
* Convert named parameters to qualified parameters, if they match.
*
* @param param parameter to resolve
* @return resolved parameter
*/
protected Parameter resolve(Parameter param) {
if (!(param instanceof NamedParameter)) return param;
String p = ((NamedParameter)param).name();
if (this.param != null && this.param.name().equals(p)) return this.param;
if (values != null) {
for (Entry<Parameter, GenericValue> e : values.entrySet()) {
if (e.getKey().name().equals(p)) return e.getKey();
}
}
return param;
}

@Override
public String toString() {
StringBuffer sb = new StringBuffer();
Expand Down
Loading