Skip to content

Fixing issue 486 @SubParameter Problems #515

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
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fixing issue 486 @SubParameter Problems #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed342e9
Update WrappedParameter.java
fsd654qyl Apr 25, 2021
04ee15c
Update ParameterDescription.java
fsd654qyl Apr 25, 2021
75e3b59
Update Parameter.java
fsd654qyl May 18, 2021
e091e04
Update ParameterDescription.java
fsd654qyl May 18, 2021
8c2dfe9
Update ParameterDescription.java
fsd654qyl May 18, 2021
5ac48bc
Update Parameter.java
fsd654qyl May 18, 2021
c9bc3a4
Update Parameter.java
fsd654qyl May 18, 2021
4537812
Update ParameterDescription.java
fsd654qyl May 18, 2021
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
3 changes: 3 additions & 0 deletions src/main/java/com/beust/jcommander/ParameterDescription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,10 @@ private Object handleSubParameters(String value, int currentIndex, Class<?> type
objectValue = type.newInstance();
parameterized.set(object, objectValue);
}
boolean access = sai.field.isAccessible();
sai.field.setAccessible(true); // before using the field, set accessible to true
wrappedParameter.addValue(parameterized, objectValue, value, sai.field);
sai.field.setAccessible(access); // after using the field, set accessible to origin
finalValue = objectValue;
} catch (InstantiationException | IllegalAccessException e) {
throw new ParameterException("Couldn't instantiate " + type, e);
Expand Down
26 changes: 26 additions & 0 deletions src/main/java/com/beust/jcommander/WrappedParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,32 @@ public void addValue(Parameterized parameterized, Object object, Object value, F
throws IllegalAccessException {
if (parameter != null) {
if (field != null) {
Class<?> fieldClass = field.getType();
if (fieldClass != value.getClass()) {
if (fieldClass == boolean.class || fieldClass == Boolean.class)
value = Boolean.parseBoolean(value.toString());
else if (fieldClass == byte.class || fieldClass == Byte.class)
value = Byte.parseByte(value.toString());
else if (fieldClass == short.class || fieldClass == Short.class)
value = Short.parseShort(value.toString());
else if (fieldClass == int.class || fieldClass == Integer.class)
value = Integer.parseInt(value.toString());
else if (fieldClass == long.class || fieldClass == Long.class)
value = Long.parseLong(value.toString());
else if (fieldClass == char.class || fieldClass == Character.class)
value = value.toString().charAt(0);
else if (fieldClass == float.class || fieldClass == Float.class)
value = Float.parseFloat(value.toString());
else if (fieldClass == double.class || fieldClass == Double.class)
value = Double.parseDouble(value.toString());
else {
try {
value = fieldClass.getConstructor(value.getClass()).newInstance(value);
} catch (InstantiationException | InvocationTargetException | NoSuchMethodException e) {
e.printStackTrace();
}
}
}
field.set(object, value);
} else {
parameterized.set(object, value);
Expand Down