Changeset 32434
- Timestamp:
- 2018-09-10T09:57:07+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java
r32363 r32434 652 652 { // this line is an attempted solution to the NullPointerException mentioned 653 653 // in trac bug ticket #225. If n is null can't do n.getFirstChild() below. As per bug #225: 654 // GSXML.getNodeByPath() is called by GS2BrowseAction, which then calls this method.654 // getNodeByPath() is called by GS2BrowseAction, which then calls this method. 655 655 // If n is null, null will be returned which GS2BrowseAction already checks for. It's here 656 656 // that the NullPointerException was thrown. … … 952 952 public static Element createBasicResponse(Document owner, String from) 953 953 { 954 Element response = owner.createElement( GSXML.RESPONSE_ELEM);955 response.setAttribute( GSXML.FROM_ATT, from);956 response.setAttribute( GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);954 Element response = owner.createElement(RESPONSE_ELEM); 955 response.setAttribute(FROM_ATT, from); 956 response.setAttribute(TYPE_ATT, REQUEST_TYPE_PROCESS); 957 957 return response; 958 958 } … … 960 960 public static Element createMetadataElement(Document owner, String name, String value) 961 961 { 962 Element metaElem = owner.createElement( GSXML.METADATA_ELEM);963 metaElem.setAttribute( GSXML.NAME_ATT, name);964 metaElem.setAttribute( GSXML.VALUE_ATT, value);962 Element metaElem = owner.createElement(METADATA_ELEM); 963 metaElem.setAttribute(NAME_ATT, name); 964 metaElem.setAttribute(VALUE_ATT, value); 965 965 return metaElem; 966 966 } … … 1031 1031 p.setAttribute(NAME_ATT, id); 1032 1032 p.setAttribute(TYPE_ATT, type); 1033 p.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, display_name));1033 p.appendChild(createDisplayTextElement(owner, DISPLAY_TEXT_NAME, display_name)); 1034 1034 1035 1035 if (default_value != null) … … 1043 1043 Element e = owner.createElement(PARAM_OPTION_ELEM); 1044 1044 e.setAttribute(NAME_ATT, option_ids[i]); 1045 e.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, option_names[i]));1045 e.appendChild(createDisplayTextElement(owner, DISPLAY_TEXT_NAME, option_names[i])); 1046 1046 p.appendChild(e); 1047 1047 } … … 1056 1056 p.setAttribute(NAME_ATT, id); 1057 1057 p.setAttribute(TYPE_ATT, type); 1058 p.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, display_name));1058 p.appendChild(createDisplayTextElement(owner, DISPLAY_TEXT_NAME, display_name)); 1059 1059 if (default_value != null) 1060 1060 { … … 1067 1067 Element e = owner.createElement(PARAM_OPTION_ELEM); 1068 1068 e.setAttribute(NAME_ATT, option_ids.get(i)); 1069 e.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, option_names.get(i)));1069 e.appendChild(createDisplayTextElement(owner, DISPLAY_TEXT_NAME, option_names.get(i))); 1070 1070 p.appendChild(e); 1071 1071 } … … 1138 1138 MyNodeList result = new MyNodeList(); 1139 1139 1140 NodeList matchingNodes = GSXML.getNamedElementsNS(parent, namespace_uri, node_local_name, attribute_names[0], attribute_values[0]);1140 NodeList matchingNodes = getNamedElementsNS(parent, namespace_uri, node_local_name, attribute_names[0], attribute_values[0]); 1141 1141 for (int i = 0; i < matchingNodes.getLength(); i++) 1142 1142 { … … 1165 1165 public static void removeElementsWithAttributesNS(Element parent, String namespace_uri, String node_local_name, String[] attribute_names, String[] attribute_values) 1166 1166 { 1167 NodeList matchingNodes = GSXML.getElementsWithAttributesNS(parent, namespace_uri, node_local_name, attribute_names, attribute_values);1167 NodeList matchingNodes = getElementsWithAttributesNS(parent, namespace_uri, node_local_name, attribute_names, attribute_values); 1168 1168 for (int i = 0; i < matchingNodes.getLength(); i++) 1169 1169 { … … 1184 1184 } 1185 1185 1186 Element old_elem = GSXML.getNamedElementNS(parent, namespace_uri, node_local_name, attribute_name, attribute_value);1186 Element old_elem = getNamedElementNS(parent, namespace_uri, node_local_name, attribute_name, attribute_value); 1187 1187 if (old_elem != null) 1188 1188 { … … 1662 1662 ArrayList<String> groups = new ArrayList<String>(); 1663 1663 1664 Element groupList = (Element) GSXML.getChildByTagName(securityResponse, GSXML.GROUP_ELEM + GSXML.LIST_MODIFIER);1664 Element groupList = (Element) getChildByTagName(securityResponse, GROUP_ELEM + LIST_MODIFIER); 1665 1665 if (groupList == null) 1666 1666 { … … 1668 1668 } 1669 1669 1670 NodeList groupElems = GSXML.getChildrenByTagName(groupList, GSXML.GROUP_ELEM);1670 NodeList groupElems = getChildrenByTagName(groupList, GROUP_ELEM); 1671 1671 1672 1672 for (int i = 0; i < groupElems.getLength(); i++) 1673 1673 { 1674 1674 Element groupElem = (Element) groupElems.item(i); 1675 groups.add(groupElem.getAttribute( GSXML.NAME_ATT));1675 groups.add(groupElem.getAttribute(NAME_ATT)); 1676 1676 } 1677 1677
Note:
See TracChangeset
for help on using the changeset viewer.