safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 17:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-497: Merge remove usage of function/classes deprecated within Java 9.

Browse Source
This commit is contained in:
Nick Couchman
2018-02-02 09:52:52 -05:00
parent d6adc07dce 37f7df804d
commit 6ed4dcdeab
5 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java
View File

@@ -76,7 +76,7 @@ public class NumericField extends Field {
return null;
// Parse as integer
return new Integer(str);
return Integer.valueOf(str);
}

3
guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java
View File

@@ -35,8 +35,7 @@ public abstract class IntegerGuacamoleProperty implements GuacamoleProperty<Inte
return null;
try {
Integer integer = new Integer(value);
return integer;
return Integer.valueOf(value);
}
catch (NumberFormatException e) {
throw new GuacamoleServerException("Property \"" + getName() + "\" must be an integer.", e);

3
guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java
View File

@@ -35,8 +35,7 @@ public abstract class LongGuacamoleProperty implements GuacamoleProperty<Long> {
return null;
try {
Long longValue = new Long(value);
return longValue;
return Long.valueOf(value);
}
catch (NumberFormatException e) {
throw new GuacamoleServerException("Property \"" + getName() + "\" must be an long.", e);

10
guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java
View File

@@ -84,6 +84,10 @@ public class DocumentHandler extends DefaultHandler {
public void startElement(String uri, String localName, String qName,
Attributes attributes) throws SAXException {
// If the SAX implementation does not provide the local name, the
// qualified name should be used instead
String name = localName.isEmpty() ? qName : localName;
// Get current state
DocumentHandlerState current = getCurrentState();
@@ -94,7 +98,7 @@ public class DocumentHandler extends DefaultHandler {
if (current == null) {
// Validate element name
if (!localName.equals(rootElementName))
if (!name.equals(rootElementName))
throw new SAXException("Root element must be '" + rootElementName + "'");
handler = root;
@@ -103,12 +107,12 @@ public class DocumentHandler extends DefaultHandler {
// Otherwise, get handler from parent
else {
TagHandler parent_handler = current.getTagHandler();
handler = parent_handler.childElement(localName);
handler = parent_handler.childElement(name);
}
// If no handler returned, the element was not expected
if (handler == null)
throw new SAXException("Unexpected element: '" + localName + "'");
throw new SAXException("Unexpected element: '" + name + "'");
// Initialize handler
handler.init(attributes);