diff --git a/source/net/yacy/upnp/Discovery.java b/source/net/yacy/upnp/Discovery.java index d281f325a..910656250 100644 --- a/source/net/yacy/upnp/Discovery.java +++ b/source/net/yacy/upnp/Discovery.java @@ -180,18 +180,18 @@ public class Discovery { DiscoveryListener.getInstance().registerResultsHandler( handler, searchTarget ); if ( ni == null ) { - for ( Enumeration e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements(); ) { - NetworkInterface intf = (NetworkInterface)e.nextElement(); - for ( Enumeration adrs = intf.getInetAddresses(); adrs.hasMoreElements(); ) { - InetAddress adr = (InetAddress)adrs.nextElement(); + for ( Enumeration e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements(); ) { + NetworkInterface intf = e.nextElement(); + for ( Enumeration adrs = intf.getInetAddresses(); adrs.hasMoreElements(); ) { + InetAddress adr = adrs.nextElement(); if ( adr instanceof Inet4Address && !adr.isLoopbackAddress() ) { sendSearchMessage( adr, ttl, mx, searchTarget ); } } } } else { - for ( Enumeration adrs = ni.getInetAddresses(); adrs.hasMoreElements(); ) { - InetAddress adr = (InetAddress)adrs.nextElement(); + for ( Enumeration adrs = ni.getInetAddresses(); adrs.hasMoreElements(); ) { + InetAddress adr = adrs.nextElement(); if ( adr instanceof Inet4Address && !adr.isLoopbackAddress() ) { sendSearchMessage( adr, ttl, mx, searchTarget ); } @@ -211,8 +211,8 @@ public class Discovery { } int j = 0; UPNPRootDevice[] rootDevices = new UPNPRootDevice[devices.size()]; - for ( Iterator i = devices.values().iterator(); i.hasNext(); ) { - rootDevices[j++] = (UPNPRootDevice)i.next(); + for ( Iterator i = devices.values().iterator(); i.hasNext(); ) { + rootDevices[j++] = i.next(); } return rootDevices; diff --git a/source/net/yacy/upnp/DiscoveryAdvertisement.java b/source/net/yacy/upnp/DiscoveryAdvertisement.java index cc939ef5b..1d1c9975d 100644 --- a/source/net/yacy/upnp/DiscoveryAdvertisement.java +++ b/source/net/yacy/upnp/DiscoveryAdvertisement.java @@ -152,7 +152,7 @@ public class DiscoveryAdvertisement implements Runnable { synchronized( REGISTRATION_PROCESS ) { if ( nt == null ) nt = NT_ALL_EVENTS; if ( notificationEvent == EVENT_SSDP_ALIVE ) { - Set handlers = aliveRegistered.get( nt ); + Set handlers = aliveRegistered.get( nt ); if ( handlers != null ) { handlers.remove( eventHandler ); if ( handlers.size() == 0 ) { @@ -160,7 +160,7 @@ public class DiscoveryAdvertisement implements Runnable { } } } else if ( notificationEvent == EVENT_SSDP_BYE_BYE ) { - Set handlers = byeByeRegistered.get( nt ); + Set handlers = byeByeRegistered.get( nt ); if ( handlers != null ) { handlers.remove( eventHandler ); if ( handlers.size() == 0 ) { @@ -304,17 +304,17 @@ public class DiscoveryAdvertisement implements Runnable { int index = udn.indexOf( "::" ); if ( index != -1 ) udn = udn.substring( 0, index ); synchronized( REGISTRATION_PROCESS ) { - Set handlers = aliveRegistered.get( NT_ALL_EVENTS ); + Set handlers = aliveRegistered.get( NT_ALL_EVENTS ); if ( handlers != null ) { - for ( Iterator i = handlers.iterator(); i.hasNext(); ) { - DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); + for ( Iterator i = handlers.iterator(); i.hasNext(); ) { + DiscoveryEventHandler eventHandler = i.next(); eventHandler.eventSSDPAlive( usn, udn, nt, maxAge, loc ); } } handlers = aliveRegistered.get( nt ); if ( handlers != null ) { - for ( Iterator i = handlers.iterator(); i.hasNext(); ) { - DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); + for ( Iterator i = handlers.iterator(); i.hasNext(); ) { + DiscoveryEventHandler eventHandler = i.next(); eventHandler.eventSSDPAlive( usn, udn, nt, maxAge, loc ); } } @@ -347,17 +347,17 @@ public class DiscoveryAdvertisement implements Runnable { int index = udn.indexOf( "::" ); if ( index != -1 ) udn = udn.substring( 0, index ); synchronized( REGISTRATION_PROCESS ) { - Set handlers = byeByeRegistered.get( NT_ALL_EVENTS ); + Set handlers = byeByeRegistered.get( NT_ALL_EVENTS ); if ( handlers != null ) { - for ( Iterator i = handlers.iterator(); i.hasNext(); ) { - DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); + for ( Iterator i = handlers.iterator(); i.hasNext(); ) { + DiscoveryEventHandler eventHandler = i.next(); eventHandler.eventSSDPByeBye( usn, udn, nt ); } } handlers = byeByeRegistered.get( nt ); if ( handlers != null ) { - for ( Iterator i = handlers.iterator(); i.hasNext(); ) { - DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); + for ( Iterator i = handlers.iterator(); i.hasNext(); ) { + DiscoveryEventHandler eventHandler = i.next(); eventHandler.eventSSDPByeBye( usn, udn, nt ); } } diff --git a/source/net/yacy/upnp/DiscoveryListener.java b/source/net/yacy/upnp/DiscoveryListener.java index 219b016ba..f8f2b9ac8 100644 --- a/source/net/yacy/upnp/DiscoveryListener.java +++ b/source/net/yacy/upnp/DiscoveryListener.java @@ -73,7 +73,7 @@ public class DiscoveryListener implements Runnable { private static final int DEFAULT_TIMEOUT = 250; - private Map registeredHandlers = new HashMap(); + private Map> registeredHandlers = new HashMap>(); private final Object REGISTRATION_PROCESS = new Object(); @@ -106,13 +106,12 @@ public class DiscoveryListener implements Runnable { * @param searchTarget the search target * @throws IOException if some errors occurs during SSDP search response messages listener thread startup */ - @SuppressWarnings("unchecked") public void registerResultsHandler( DiscoveryResultsHandler resultsHandler, String searchTarget ) throws IOException { synchronized( REGISTRATION_PROCESS ) { if ( !inService ) startDevicesListenerThread(); - Set handlers = registeredHandlers.get( searchTarget ); + Set handlers = registeredHandlers.get( searchTarget ); if ( handlers == null ) { - handlers = new HashSet(); + handlers = new HashSet(); registeredHandlers.put( searchTarget, handlers ); } handlers.add( resultsHandler ); @@ -126,7 +125,7 @@ public class DiscoveryListener implements Runnable { */ public void unRegisterResultsHandler( DiscoveryResultsHandler resultsHandler, String searchTarget ) { synchronized( REGISTRATION_PROCESS ) { - Set handlers = registeredHandlers.get( searchTarget ); + Set handlers = registeredHandlers.get( searchTarget ); if ( handlers != null ) { handlers.remove( resultsHandler ); if ( handlers.size() == 0 ) { @@ -267,10 +266,10 @@ public class DiscoveryListener implements Runnable { int index = udn.indexOf( "::" ); if ( index != -1 ) udn = udn.substring( 0, index ); synchronized( REGISTRATION_PROCESS ) { - Set handlers = registeredHandlers.get( st ); + Set handlers = registeredHandlers.get( st ); if ( handlers != null ) { - for ( Iterator i = handlers.iterator(); i.hasNext(); ) { - DiscoveryResultsHandler handler = (DiscoveryResultsHandler)i.next(); + for ( Iterator i = handlers.iterator(); i.hasNext(); ) { + DiscoveryResultsHandler handler = i.next(); handler.discoveredDevice( usn, udn, st, maxAge, loc, server ); } } diff --git a/source/net/yacy/upnp/ServiceEventMessageParser.java b/source/net/yacy/upnp/ServiceEventMessageParser.java index 5c9e773e5..acbfbe587 100644 --- a/source/net/yacy/upnp/ServiceEventMessageParser.java +++ b/source/net/yacy/upnp/ServiceEventMessageParser.java @@ -69,7 +69,7 @@ public class ServiceEventMessageParser extends org.xml.sax.helpers.DefaultHandle protected ServiceEventMessageParser() { } - public Map getChangedStateVars() { + public Map getChangedStateVars() { return changedStateVars; } diff --git a/source/net/yacy/upnp/ServicesEventing.java b/source/net/yacy/upnp/ServicesEventing.java index b46fce865..38d1fd2ca 100644 --- a/source/net/yacy/upnp/ServicesEventing.java +++ b/source/net/yacy/upnp/ServicesEventing.java @@ -203,8 +203,8 @@ public class ServicesEventing implements Runnable { private Subscription lookupSubscriber( UPNPService service, ServiceEventHandler handler ) { synchronized( registered ) { - for ( Iterator i = registered.iterator(); i.hasNext(); ) { - Subscription sub = (Subscription)i.next(); + for ( Iterator i = registered.iterator(); i.hasNext(); ) { + Subscription sub = i.next(); if ( sub.handler == handler && sub.sub.getServiceId().hashCode() == service.getServiceId().hashCode() && @@ -219,8 +219,8 @@ public class ServicesEventing implements Runnable { private Subscription lookupSubscriber( String sid, InetAddress deviceIp ) { synchronized( registered ) { - for ( Iterator i = registered.iterator(); i.hasNext(); ) { - Subscription sub = (Subscription)i.next(); + for ( Iterator i = registered.iterator(); i.hasNext(); ) { + Subscription sub = i.next(); if ( sub.sub.getSID().equals( sid ) && sub.sub.getDeviceIp().equals( deviceIp ) ) { return sub; @@ -232,8 +232,8 @@ public class ServicesEventing implements Runnable { private Subscription lookupSubscriber( String sid ) { synchronized( registered ) { - for ( Iterator i = registered.iterator(); i.hasNext(); ) { - Subscription sub = (Subscription)i.next(); + for ( Iterator i = registered.iterator(); i.hasNext(); ) { + Subscription sub = i.next(); if ( sub.sub.getSID().equals( sid ) ) { return sub; @@ -416,10 +416,10 @@ public class ServicesEventing implements Runnable { InputSource src = new InputSource( stringReader ); parser.parse( src, msgParser ); - Map changedStateVars = msgParser.getChangedStateVars(); - for ( Iterator i = changedStateVars.keySet().iterator(); i.hasNext(); ) { - String stateVarName = (String)i.next(); - String stateVarNewVal = (String)changedStateVars.get( stateVarName ); + Map changedStateVars = msgParser.getChangedStateVars(); + for ( Iterator i = changedStateVars.keySet().iterator(); i.hasNext(); ) { + String stateVarName = i.next(); + String stateVarNewVal = changedStateVars.get( stateVarName ); subscription.handler.handleStateVariableEvent( stateVarName, stateVarNewVal ); } } diff --git a/source/net/yacy/upnp/devices/UPNPDevice.java b/source/net/yacy/upnp/devices/UPNPDevice.java index 77dfe6ddf..a247e0e3d 100644 --- a/source/net/yacy/upnp/devices/UPNPDevice.java +++ b/source/net/yacy/upnp/devices/UPNPDevice.java @@ -151,7 +151,7 @@ public class UPNPDevice { * Access to the device icons definitions * @return a list containing DeviceIcon objects or null if no icons defined */ - public List getDeviceIcons() { + public List getDeviceIcons() { return deviceIcons; } @@ -163,8 +163,8 @@ public class UPNPDevice { public ArrayList getChildDevices() { if ( childDevices == null ) return null; ArrayList rtrVal = new ArrayList(); - for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { - UPNPDevice device = (UPNPDevice)itr.next(); + for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { + UPNPDevice device = itr.next(); rtrVal.add( device ); ArrayList found = device.getChildDevices(); if ( found != null ) { @@ -180,11 +180,11 @@ public class UPNPDevice { * UPNPDevice objects for this device. * @return the generated list or null if no child devices bound */ - public List getTopLevelChildDevices() { + public List getTopLevelChildDevices() { if ( childDevices == null ) return null; List rtrVal = new ArrayList(); - for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { - UPNPDevice device = (UPNPDevice)itr.next(); + for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { + UPNPDevice device = itr.next(); rtrVal.add( device ); } return rtrVal; @@ -209,8 +209,8 @@ public class UPNPDevice { if ( log.isDebugEnabled() ) log.debug( "searching for device URI:" + deviceURI ); if ( getDeviceType().equals( deviceURI ) ) return this; if ( childDevices == null ) return null; - for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { - UPNPDevice device = (UPNPDevice)itr.next(); + for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { + UPNPDevice device = itr.next(); UPNPDevice found = device.getChildDevice( deviceURI ); if ( found != null ) { return found; @@ -223,7 +223,7 @@ public class UPNPDevice { * Looks for all UPNP device service definitions objects * @return A list of all device services */ - public ArrayList getServices() { + public ArrayList getServices() { if ( services == null ) return null; ArrayList rtrVal = new ArrayList(); rtrVal.addAll( services ); @@ -238,8 +238,8 @@ public class UPNPDevice { public UPNPService getService( String serviceURI ) { if ( services == null ) return null; if ( log.isDebugEnabled() ) log.debug( "searching for service URI:" + serviceURI ); - for ( Iterator itr = services.iterator(); itr.hasNext(); ) { - UPNPService service = (UPNPService)itr.next(); + for ( Iterator itr = services.iterator(); itr.hasNext(); ) { + UPNPService service = itr.next(); if ( service.getServiceType().equals( serviceURI ) ) { return service; } @@ -255,8 +255,8 @@ public class UPNPDevice { public UPNPService getServiceByID( String serviceID ) { if ( services == null ) return null; if ( log.isDebugEnabled() ) log.debug( "searching for service ID:" + serviceID ); - for ( Iterator itr = services.iterator(); itr.hasNext(); ) { - UPNPService service = (UPNPService)itr.next(); + for ( Iterator itr = services.iterator(); itr.hasNext(); ) { + UPNPService service = itr.next(); if ( service.getServiceId().equals( serviceID ) ) { return service; } @@ -271,12 +271,12 @@ public class UPNPDevice { * @param serviceURI the URI of the service * @return A matching List of UPNPService objects or null */ - public List getServices( String serviceURI ) { + public List getServices( String serviceURI ) { if ( services == null ) return null; List rtrVal = new ArrayList(); if ( log.isDebugEnabled() ) log.debug( "searching for services URI:" + serviceURI ); - for ( Iterator itr = services.iterator(); itr.hasNext(); ) { - UPNPService service = (UPNPService)itr.next(); + for ( Iterator itr = services.iterator(); itr.hasNext(); ) { + UPNPService service = itr.next(); if ( service.getServiceType().equals( serviceURI ) ) { rtrVal.add( service ); } diff --git a/source/net/yacy/upnp/impls/InternetGatewayDevice.java b/source/net/yacy/upnp/impls/InternetGatewayDevice.java index 11dc8b2d2..0ccd48479 100644 --- a/source/net/yacy/upnp/impls/InternetGatewayDevice.java +++ b/source/net/yacy/upnp/impls/InternetGatewayDevice.java @@ -268,8 +268,8 @@ public class InternetGatewayDevice { } rtrVal = new InternetGatewayDevice[valid.size()]; int i = 0; - for ( Iterator itr = valid.iterator(); itr.hasNext(); ) { - rtrVal[i++] = (InternetGatewayDevice)itr.next(); + for ( Iterator itr = valid.iterator(); itr.hasNext(); ) { + rtrVal[i++] = itr.next(); } } diff --git a/source/net/yacy/upnp/messages/ActionMessage.java b/source/net/yacy/upnp/messages/ActionMessage.java index b0b1d5820..cacac539b 100644 --- a/source/net/yacy/upnp/messages/ActionMessage.java +++ b/source/net/yacy/upnp/messages/ActionMessage.java @@ -118,8 +118,8 @@ public class ActionMessage { if ( serviceAction.getInputActionArguments() != null ) { // this action requires params so we just set them... - for ( Iterator itr = inputParameters.iterator(); itr.hasNext(); ) { - InputParamContainer container = (InputParamContainer)itr.next(); + for ( Iterator itr = inputParameters.iterator(); itr.hasNext(); ) { + InputParamContainer container = itr.next(); body.append( "<" ).append( container.name ).append( ">" ).append( container.value ); body.append( "" ); } @@ -235,7 +235,7 @@ public class ActionMessage { * @return a list of required input parameters ServiceActionArgument objects for this message * or null if the message does not require any input params */ - public List getInputParameterNames() { + public List getInputParameterNames() { return serviceAction.getInputActionArgumentsNames(); } @@ -244,7 +244,7 @@ public class ActionMessage { * @return a list of output parameters ServiceActionArgument objects for this message * or null if the message does not contains any output params. */ - public List getOutputParameterNames() { + public List getOutputParameterNames() { return serviceAction.getOutputActionArgumentsNames(); } @@ -296,8 +296,8 @@ public class ActionMessage { if ( serviceAction.getInputActionArguments() == null ) throw new IllegalArgumentException( "No input parameters required for this message" ); ServiceActionArgument arg = serviceAction.getInputActionArgument( parameterName ); if ( arg == null ) throw new IllegalArgumentException( "Wrong input argument name for this action:" + parameterName + " available parameters are : " + getInputParameterNames() ); - for ( Iterator i = inputParameters.iterator(); i.hasNext(); ) { - InputParamContainer container = (InputParamContainer)i.next(); + for ( Iterator i = inputParameters.iterator(); i.hasNext(); ) { + InputParamContainer container = i.next(); if ( container.name.equals( parameterName ) ) { container.value = parameterValue; return this; diff --git a/source/net/yacy/upnp/messages/ActionResponse.java b/source/net/yacy/upnp/messages/ActionResponse.java index 8ad2d6165..257ec1a82 100644 --- a/source/net/yacy/upnp/messages/ActionResponse.java +++ b/source/net/yacy/upnp/messages/ActionResponse.java @@ -72,7 +72,7 @@ public class ActionResponse { return outArgumentsVals.get( actionArgumentName ); } - public Set getOutActionArgumentNames() { + public Set getOutActionArgumentNames() { return outArguments.keySet(); } @@ -89,8 +89,8 @@ public class ActionResponse { public String toString() { StringBuffer rtrVal = new StringBuffer(); - for ( Iterator i = outArguments.keySet().iterator(); i.hasNext(); ) { - String name = (String)i.next(); + for ( Iterator i = outArguments.keySet().iterator(); i.hasNext(); ) { + String name = i.next(); String value = outArgumentsVals.get( name ); rtrVal.append( name ).append( "=" ).append( value ); if ( i.hasNext() ) rtrVal.append( "\n" ); diff --git a/source/net/yacy/upnp/services/ServiceAction.java b/source/net/yacy/upnp/services/ServiceAction.java index 784c20a83..18e1e8765 100644 --- a/source/net/yacy/upnp/services/ServiceAction.java +++ b/source/net/yacy/upnp/services/ServiceAction.java @@ -58,11 +58,11 @@ public class ServiceAction { protected String name; protected UPNPService parent; - private List orderedActionArguments; - private List orderedInputActionArguments; - private List orderedOutputActionArguments; - private List orderedInputActionArgumentsNames; - private List orderedOutputActionArgumentsNames; + private List orderedActionArguments; + private List orderedInputActionArguments; + private List orderedOutputActionArguments; + private List orderedInputActionArgumentsNames; + private List orderedOutputActionArgumentsNames; protected ServiceAction() { } @@ -75,7 +75,7 @@ public class ServiceAction { * The action in and out arguments ServiceActionArgument objects list * @return the list with ServiceActionArgument objects or null if the action has no params */ - public List getActionArguments() { + public List getActionArguments() { return orderedActionArguments; } @@ -86,14 +86,14 @@ public class ServiceAction { */ public ServiceActionArgument getActionArgument( String argumentName ) { if ( orderedActionArguments == null ) return null; - for ( Iterator i = orderedActionArguments.iterator(); i.hasNext(); ) { - ServiceActionArgument arg = (ServiceActionArgument)i.next(); + for ( Iterator i = orderedActionArguments.iterator(); i.hasNext(); ) { + ServiceActionArgument arg = i.next(); if ( arg.getName().equals( argumentName ) ) return arg; } return null; } - protected void setActionArguments( List orderedActionArguments ) { + protected void setActionArguments( List orderedActionArguments ) { this.orderedActionArguments = orderedActionArguments; orderedInputActionArguments = getListForActionArgument( orderedActionArguments, ServiceActionArgument.DIRECTION_IN ); orderedOutputActionArguments = getListForActionArgument( orderedActionArguments, ServiceActionArgument.DIRECTION_OUT ); @@ -106,7 +106,7 @@ public class ServiceAction { * @return a list containing input arguments ServiceActionArgument objects or null when nothing * is needed for such operation */ - public List getInputActionArguments() { + public List getInputActionArguments() { return orderedInputActionArguments; } @@ -117,8 +117,8 @@ public class ServiceAction { */ public ServiceActionArgument getInputActionArgument( String argumentName ) { if ( orderedInputActionArguments == null ) return null; - for ( Iterator i = orderedInputActionArguments.iterator(); i.hasNext(); ) { - ServiceActionArgument arg = (ServiceActionArgument)i.next(); + for ( Iterator i = orderedInputActionArguments.iterator(); i.hasNext(); ) { + ServiceActionArgument arg = i.next(); if ( arg.getName().equals( argumentName ) ) return arg; } return null; @@ -130,7 +130,7 @@ public class ServiceAction { * @return a list containing output arguments ServiceActionArgument objects or null when nothing * returned for such operation */ - public List getOutputActionArguments() { + public List getOutputActionArguments() { return orderedOutputActionArguments; } @@ -141,8 +141,8 @@ public class ServiceAction { */ public ServiceActionArgument getOutputActionArgument( String argumentName ) { if ( orderedOutputActionArguments == null ) return null; - for ( Iterator i = orderedOutputActionArguments.iterator(); i.hasNext(); ) { - ServiceActionArgument arg = (ServiceActionArgument)i.next(); + for ( Iterator i = orderedOutputActionArguments.iterator(); i.hasNext(); ) { + ServiceActionArgument arg = i.next(); if ( arg.getName().equals( argumentName ) ) return arg; } return null; @@ -153,7 +153,7 @@ public class ServiceAction { * @return a list containing input arguments names as Strings or null when nothing * is needed for such operation */ - public List getInputActionArgumentsNames() { + public List getInputActionArgumentsNames() { return orderedInputActionArgumentsNames; } @@ -162,7 +162,7 @@ public class ServiceAction { * @return a list containing output arguments names as Strings or null when nothing * returned for such operation */ - public List getOutputActionArgumentsNames() { + public List getOutputActionArgumentsNames() { return orderedOutputActionArgumentsNames; } @@ -174,11 +174,11 @@ public class ServiceAction { return name; } - private List getListForActionArgument( List args, String direction ) { + private List getListForActionArgument( List args, String direction ) { if ( args == null ) return null; List rtrVal = new ArrayList(); - for ( Iterator itr = args.iterator(); itr.hasNext(); ) { - ServiceActionArgument actArg = (ServiceActionArgument)itr.next(); + for ( Iterator itr = args.iterator(); itr.hasNext(); ) { + ServiceActionArgument actArg = itr.next(); if ( actArg.getDirection() == direction ) { rtrVal.add( actArg ); } @@ -187,11 +187,11 @@ public class ServiceAction { return rtrVal; } - private List getListForActionArgumentNames( List args, String direction ) { + private List getListForActionArgumentNames( List args, String direction ) { if ( args == null ) return null; List rtrVal = new ArrayList(); - for ( Iterator itr = args.iterator(); itr.hasNext(); ) { - ServiceActionArgument actArg = (ServiceActionArgument)itr.next(); + for ( Iterator itr = args.iterator(); itr.hasNext(); ) { + ServiceActionArgument actArg = itr.next(); if ( actArg.getDirection() == direction ) { rtrVal.add( actArg.getName() ); } diff --git a/source/net/yacy/upnp/services/ServiceStateVariable.java b/source/net/yacy/upnp/services/ServiceStateVariable.java index a0876ff80..188d98c15 100644 --- a/source/net/yacy/upnp/services/ServiceStateVariable.java +++ b/source/net/yacy/upnp/services/ServiceStateVariable.java @@ -144,7 +144,7 @@ public class ServiceStateVariable implements ServiceStateVariableTypes { * The varialbe JAVA data type (using an UPNP->Java mapping) * @return the class mapped */ - public Class getDataTypeAsClass() { + public Class getDataTypeAsClass() { return getDataTypeClassMapping( dataType ); } @@ -152,7 +152,7 @@ public class ServiceStateVariable implements ServiceStateVariableTypes { * A set of allowed values (String objects) for the variable * @return the allowed values or null if none */ - public Set getAllowedvalues() { + public Set getAllowedvalues() { return allowedvalues; } @@ -180,7 +180,7 @@ public class ServiceStateVariable implements ServiceStateVariableTypes { return stepRangeValue; } - public static Class getDataTypeClassMapping( String dataType ) { + public static Class getDataTypeClassMapping( String dataType ) { int hash = dataType.hashCode(); if ( hash == UI1_INT ) return Short.class; else if ( hash == UI2_INT ) return Integer.class; diff --git a/source/net/yacy/upnp/services/UPNPService.java b/source/net/yacy/upnp/services/UPNPService.java index a6ab06310..efe8ec260 100644 --- a/source/net/yacy/upnp/services/UPNPService.java +++ b/source/net/yacy/upnp/services/UPNPService.java @@ -149,7 +149,7 @@ public class UPNPService { return UPNPServiceStateVariables.get( stateVariableName ); } - public Iterator getAvailableActionsName() { + public Iterator getAvailableActionsName() { lazyInitiate(); return UPNPServiceActions.keySet().iterator(); } @@ -159,7 +159,7 @@ public class UPNPService { return UPNPServiceActions.keySet().size(); } - public Iterator getAvailableStateVariableName() { + public Iterator getAvailableStateVariableName() { lazyInitiate(); return UPNPServiceStateVariables.keySet().iterator(); }