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.

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

Jump to bottom

Variable's string representation can be passed in sub element #2

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

Variable's string representation can be passed in sub element #2

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
58 changes: 42 additions & 16 deletions src/org/rubyforge/debugcommons/reader/VariablesReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,27 +73,53 @@ private void parseVariables() throws XmlPullParserException, IOException {
if (Util.isEndTag(xpp, "variables")) {
break;
}
assert xpp.getName().equals("variable") : xpp.getName() + "(type: " + Util.getType(xpp) + ") encountered";
String name = getAttributeValue("name");
String value = getAttributeValue("value");
String kind = getAttributeValue("kind");
RubyVariableInfo newVariable;
if (value == null) {
newVariable = new RubyVariableInfo(name, kind);
} else {
String type = getAttributeValue("type");
boolean hasChildren = getAttributeBoolValue("hasChildren");
String objectId = getAttributeValue("objectId");
newVariable = new RubyVariableInfo(name, kind, value, type, hasChildren, objectId);
}
_variables.add(newVariable);
ensureEndTag("variable");
_variables.add(parseVariable());
}
this.variables = _variables.toArray(new RubyVariableInfo[_variables.size()]);
}

private RubyVariableInfo parseVariable() throws XmlPullParserException, IOException {
assert xpp.getName().equals("variable") : xpp.getName() + "(type: " + Util.getType(xpp) + ") encountered";
final String name = getAttributeValue("name");
String value = getAttributeValue("value");
final String kind = getAttributeValue("kind");

if (value == null) {
ensureEndTag("variable");
return new RubyVariableInfo(name, kind);
}

final String type = getAttributeValue("type");
final boolean hasChildren = getAttributeBoolValue("hasChildren");
final String objectId = getAttributeValue("objectId");
value = readValueFromElement(value);
ensureAtEndTag(xpp, "variable");

return new RubyVariableInfo(name, kind, value, type, hasChildren, objectId);
}

/**
* Tries to read value from {@code value} sub-element, if there is no sub-element default value will be returned.
* Note: xpp moved to the next event after sub-element.
*/
private String readValueFromElement(final String defaultValue) throws IOException, XmlPullParserException {
String value = defaultValue;
final int nextTag = xpp.next();
if (nextTag == XmlPullParser.START_TAG && "value".equals(xpp.getName())) {
xpp.next();
if (xpp.getEventType() == XmlPullParser.TEXT) {
value = xpp.getText();
xpp.next();
}
ensureAtEndTag(xpp, "value");
xpp.next();
}

return value;
}

private void parseProcessingException() throws XmlPullParserException, IOException {
LOGGER.severe("Processing exception occured." +
LOGGER.severe("Processing exception occurred." +
" exceptionMessage: " + getAttributeValue("message") +
", exceptionType: " + getAttributeValue("type"));
ensureEndTag("processingException");
Expand Down
16 changes: 12 additions & 4 deletions src/org/rubyforge/debugcommons/reader/XmlStreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,23 @@ public abstract class XmlStreamReader {
public XmlStreamReader(XmlPullParser xpp) {
this.xpp = xpp;
}

protected void ensureEndTag(final String name) throws XmlPullParserException, IOException {
int nextTag = xpp.next();
if (nextTag != XmlPullParser.END_TAG && !name.equals(xpp.getName())) {
ensureEndTag(xpp, name);
}

public static void ensureEndTag(XmlPullParser xpp, final String name) throws XmlPullParserException, IOException {
xpp.next();
ensureAtEndTag(xpp, name);
}

protected static void ensureAtEndTag(XmlPullParser xpp, final String name) throws XmlPullParserException, IOException {
if (xpp.getEventType() != XmlPullParser.END_TAG && !name.equals(xpp.getName())) {
throw new IllegalStateException(
"Unexpected event. Expecting " + name + " end tag." + xpp.getName());
}
}

/**
* Works like {@link XmlPullParser#next} but skips all {@link
* XmlPullParser#TEXT} events.
Expand Down