boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

added generics to UPnP classes

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7002 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 15 years ago
parent 15e8c13526
commit bbf887d879
12 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File

16
source/net/yacy/upnp/Discovery.java
Unescape View File

@ -180,18 +180,18 @@ public class Discovery {
DiscoveryListener.getInstance().registerResultsHandler( handler, searchTarget ); DiscoveryListener.getInstance().registerResultsHandler( handler, searchTarget );
if ( ni == null ) { if ( ni == null ) {
for ( Enumeration e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements(); ) { for ( Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements(); ) {
NetworkInterface intf = (NetworkInterface)e.nextElement(); NetworkInterface intf = e.nextElement();
for ( Enumeration adrs = intf.getInetAddresses(); adrs.hasMoreElements(); ) { for ( Enumeration<InetAddress> adrs = intf.getInetAddresses(); adrs.hasMoreElements(); ) {
InetAddress adr = (InetAddress)adrs.nextElement(); InetAddress adr = adrs.nextElement();
if ( adr instanceof Inet4Address && !adr.isLoopbackAddress() ) { if ( adr instanceof Inet4Address && !adr.isLoopbackAddress() ) {
sendSearchMessage( adr, ttl, mx, searchTarget ); sendSearchMessage( adr, ttl, mx, searchTarget );
} }
} }
} }
} else { } else {
for ( Enumeration adrs = ni.getInetAddresses(); adrs.hasMoreElements(); ) { for ( Enumeration<InetAddress> adrs = ni.getInetAddresses(); adrs.hasMoreElements(); ) {
InetAddress adr = (InetAddress)adrs.nextElement(); InetAddress adr = adrs.nextElement();
if ( adr instanceof Inet4Address && !adr.isLoopbackAddress() ) { if ( adr instanceof Inet4Address && !adr.isLoopbackAddress() ) {
sendSearchMessage( adr, ttl, mx, searchTarget ); sendSearchMessage( adr, ttl, mx, searchTarget );
} }
@ -211,8 +211,8 @@ public class Discovery {
} }
int j = 0; int j = 0;
UPNPRootDevice[] rootDevices = new UPNPRootDevice[devices.size()]; UPNPRootDevice[] rootDevices = new UPNPRootDevice[devices.size()];
for ( Iterator i = devices.values().iterator(); i.hasNext(); ) { for ( Iterator<UPNPRootDevice> i = devices.values().iterator(); i.hasNext(); ) {
rootDevices[j++] = (UPNPRootDevice)i.next(); rootDevices[j++] = i.next();
} }
return rootDevices; return rootDevices;

24
source/net/yacy/upnp/DiscoveryAdvertisement.java
Unescape View File

@ -152,7 +152,7 @@ public class DiscoveryAdvertisement implements Runnable {
synchronized( REGISTRATION_PROCESS ) { synchronized( REGISTRATION_PROCESS ) {
if ( nt == null ) nt = NT_ALL_EVENTS; if ( nt == null ) nt = NT_ALL_EVENTS;
if ( notificationEvent == EVENT_SSDP_ALIVE ) { if ( notificationEvent == EVENT_SSDP_ALIVE ) {
Set handlers = aliveRegistered.get( nt ); Set<DiscoveryEventHandler> handlers = aliveRegistered.get( nt );
if ( handlers != null ) { if ( handlers != null ) {
handlers.remove( eventHandler ); handlers.remove( eventHandler );
if ( handlers.size() == 0 ) { if ( handlers.size() == 0 ) {
@ -160,7 +160,7 @@ public class DiscoveryAdvertisement implements Runnable {
} }
} }
} else if ( notificationEvent == EVENT_SSDP_BYE_BYE ) { } else if ( notificationEvent == EVENT_SSDP_BYE_BYE ) {
Set handlers = byeByeRegistered.get( nt ); Set<DiscoveryEventHandler> handlers = byeByeRegistered.get( nt );
if ( handlers != null ) { if ( handlers != null ) {
handlers.remove( eventHandler ); handlers.remove( eventHandler );
if ( handlers.size() == 0 ) { if ( handlers.size() == 0 ) {
@ -304,17 +304,17 @@ public class DiscoveryAdvertisement implements Runnable {
int index = udn.indexOf( "::" ); int index = udn.indexOf( "::" );
if ( index != -1 ) udn = udn.substring( 0, index ); if ( index != -1 ) udn = udn.substring( 0, index );
synchronized( REGISTRATION_PROCESS ) { synchronized( REGISTRATION_PROCESS ) {
Set handlers = aliveRegistered.get( NT_ALL_EVENTS ); Set<DiscoveryEventHandler> handlers = aliveRegistered.get( NT_ALL_EVENTS );
if ( handlers != null ) { if ( handlers != null ) {
for ( Iterator i = handlers.iterator(); i.hasNext(); ) { for ( Iterator<DiscoveryEventHandler> i = handlers.iterator(); i.hasNext(); ) {
DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); DiscoveryEventHandler eventHandler = i.next();
eventHandler.eventSSDPAlive( usn, udn, nt, maxAge, loc ); eventHandler.eventSSDPAlive( usn, udn, nt, maxAge, loc );
} }
} }
handlers = aliveRegistered.get( nt ); handlers = aliveRegistered.get( nt );
if ( handlers != null ) { if ( handlers != null ) {
for ( Iterator i = handlers.iterator(); i.hasNext(); ) { for ( Iterator<DiscoveryEventHandler> i = handlers.iterator(); i.hasNext(); ) {
DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); DiscoveryEventHandler eventHandler = i.next();
eventHandler.eventSSDPAlive( usn, udn, nt, maxAge, loc ); eventHandler.eventSSDPAlive( usn, udn, nt, maxAge, loc );
} }
} }
@ -347,17 +347,17 @@ public class DiscoveryAdvertisement implements Runnable {
int index = udn.indexOf( "::" ); int index = udn.indexOf( "::" );
if ( index != -1 ) udn = udn.substring( 0, index ); if ( index != -1 ) udn = udn.substring( 0, index );
synchronized( REGISTRATION_PROCESS ) { synchronized( REGISTRATION_PROCESS ) {
Set handlers = byeByeRegistered.get( NT_ALL_EVENTS ); Set<DiscoveryEventHandler> handlers = byeByeRegistered.get( NT_ALL_EVENTS );
if ( handlers != null ) { if ( handlers != null ) {
for ( Iterator i = handlers.iterator(); i.hasNext(); ) { for ( Iterator<DiscoveryEventHandler> i = handlers.iterator(); i.hasNext(); ) {
DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); DiscoveryEventHandler eventHandler = i.next();
eventHandler.eventSSDPByeBye( usn, udn, nt ); eventHandler.eventSSDPByeBye( usn, udn, nt );
} }
} }
handlers = byeByeRegistered.get( nt ); handlers = byeByeRegistered.get( nt );
if ( handlers != null ) { if ( handlers != null ) {
for ( Iterator i = handlers.iterator(); i.hasNext(); ) { for ( Iterator<DiscoveryEventHandler> i = handlers.iterator(); i.hasNext(); ) {
DiscoveryEventHandler eventHandler = (DiscoveryEventHandler)i.next(); DiscoveryEventHandler eventHandler = i.next();
eventHandler.eventSSDPByeBye( usn, udn, nt ); eventHandler.eventSSDPByeBye( usn, udn, nt );
} }
} }

15
source/net/yacy/upnp/DiscoveryListener.java
Unescape View File

@ -73,7 +73,7 @@ public class DiscoveryListener implements Runnable {
private static final int DEFAULT_TIMEOUT = 250; private static final int DEFAULT_TIMEOUT = 250;
private Map<String, Set> registeredHandlers = new HashMap<String, Set>(); private Map<String, Set<DiscoveryResultsHandler>> registeredHandlers = new HashMap<String, Set<DiscoveryResultsHandler>>();
private final Object REGISTRATION_PROCESS = new Object(); private final Object REGISTRATION_PROCESS = new Object();
@ -106,13 +106,12 @@ public class DiscoveryListener implements Runnable {
* @param searchTarget the search target * @param searchTarget the search target
* @throws IOException if some errors occurs during SSDP search response messages listener thread startup * @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 { public void registerResultsHandler( DiscoveryResultsHandler resultsHandler, String searchTarget ) throws IOException {
synchronized( REGISTRATION_PROCESS ) { synchronized( REGISTRATION_PROCESS ) {
if ( !inService ) startDevicesListenerThread(); if ( !inService ) startDevicesListenerThread();
Set handlers = registeredHandlers.get( searchTarget ); Set<DiscoveryResultsHandler> handlers = registeredHandlers.get( searchTarget );
if ( handlers == null ) { if ( handlers == null ) {
handlers = new HashSet(); handlers = new HashSet<DiscoveryResultsHandler>();
registeredHandlers.put( searchTarget, handlers ); registeredHandlers.put( searchTarget, handlers );
} }
handlers.add( resultsHandler ); handlers.add( resultsHandler );
@ -126,7 +125,7 @@ public class DiscoveryListener implements Runnable {
*/ */
public void unRegisterResultsHandler( DiscoveryResultsHandler resultsHandler, String searchTarget ) { public void unRegisterResultsHandler( DiscoveryResultsHandler resultsHandler, String searchTarget ) {
synchronized( REGISTRATION_PROCESS ) { synchronized( REGISTRATION_PROCESS ) {
Set handlers = registeredHandlers.get( searchTarget ); Set<DiscoveryResultsHandler> handlers = registeredHandlers.get( searchTarget );
if ( handlers != null ) { if ( handlers != null ) {
handlers.remove( resultsHandler ); handlers.remove( resultsHandler );
if ( handlers.size() == 0 ) { if ( handlers.size() == 0 ) {
@ -267,10 +266,10 @@ public class DiscoveryListener implements Runnable {
int index = udn.indexOf( "::" ); int index = udn.indexOf( "::" );
if ( index != -1 ) udn = udn.substring( 0, index ); if ( index != -1 ) udn = udn.substring( 0, index );
synchronized( REGISTRATION_PROCESS ) { synchronized( REGISTRATION_PROCESS ) {
Set handlers = registeredHandlers.get( st ); Set<DiscoveryResultsHandler> handlers = registeredHandlers.get( st );
if ( handlers != null ) { if ( handlers != null ) {
for ( Iterator i = handlers.iterator(); i.hasNext(); ) { for ( Iterator<DiscoveryResultsHandler> i = handlers.iterator(); i.hasNext(); ) {
DiscoveryResultsHandler handler = (DiscoveryResultsHandler)i.next(); DiscoveryResultsHandler handler = i.next();
handler.discoveredDevice( usn, udn, st, maxAge, loc, server ); handler.discoveredDevice( usn, udn, st, maxAge, loc, server );
} }
} }

2
source/net/yacy/upnp/ServiceEventMessageParser.java
Unescape View File

@ -69,7 +69,7 @@ public class ServiceEventMessageParser extends org.xml.sax.helpers.DefaultHandle
protected ServiceEventMessageParser() { protected ServiceEventMessageParser() {
} }
public Map getChangedStateVars() { public Map<String, String> getChangedStateVars() {
return changedStateVars; return changedStateVars;
} }

20
source/net/yacy/upnp/ServicesEventing.java
Unescape View File

@ -203,8 +203,8 @@ public class ServicesEventing implements Runnable {
private Subscription lookupSubscriber( UPNPService service, ServiceEventHandler handler ) { private Subscription lookupSubscriber( UPNPService service, ServiceEventHandler handler ) {
synchronized( registered ) { synchronized( registered ) {
for ( Iterator i = registered.iterator(); i.hasNext(); ) { for ( Iterator<Subscription> i = registered.iterator(); i.hasNext(); ) {
Subscription sub = (Subscription)i.next(); Subscription sub = i.next();
if ( sub.handler == handler && if ( sub.handler == handler &&
sub.sub.getServiceId().hashCode() == service.getServiceId().hashCode() && sub.sub.getServiceId().hashCode() == service.getServiceId().hashCode() &&
@ -219,8 +219,8 @@ public class ServicesEventing implements Runnable {
private Subscription lookupSubscriber( String sid, InetAddress deviceIp ) { private Subscription lookupSubscriber( String sid, InetAddress deviceIp ) {
synchronized( registered ) { synchronized( registered ) {
for ( Iterator i = registered.iterator(); i.hasNext(); ) { for ( Iterator<Subscription> i = registered.iterator(); i.hasNext(); ) {
Subscription sub = (Subscription)i.next(); Subscription sub = i.next();
if ( sub.sub.getSID().equals( sid ) && sub.sub.getDeviceIp().equals( deviceIp ) ) { if ( sub.sub.getSID().equals( sid ) && sub.sub.getDeviceIp().equals( deviceIp ) ) {
return sub; return sub;
@ -232,8 +232,8 @@ public class ServicesEventing implements Runnable {
private Subscription lookupSubscriber( String sid ) { private Subscription lookupSubscriber( String sid ) {
synchronized( registered ) { synchronized( registered ) {
for ( Iterator i = registered.iterator(); i.hasNext(); ) { for ( Iterator<Subscription> i = registered.iterator(); i.hasNext(); ) {
Subscription sub = (Subscription)i.next(); Subscription sub = i.next();
if ( sub.sub.getSID().equals( sid ) ) { if ( sub.sub.getSID().equals( sid ) ) {
return sub; return sub;
@ -416,10 +416,10 @@ public class ServicesEventing implements Runnable {
InputSource src = new InputSource( stringReader ); InputSource src = new InputSource( stringReader );
parser.parse( src, msgParser ); parser.parse( src, msgParser );
Map changedStateVars = msgParser.getChangedStateVars(); Map<String, String> changedStateVars = msgParser.getChangedStateVars();
for ( Iterator i = changedStateVars.keySet().iterator(); i.hasNext(); ) { for ( Iterator<String> i = changedStateVars.keySet().iterator(); i.hasNext(); ) {
String stateVarName = (String)i.next(); String stateVarName = i.next();
String stateVarNewVal = (String)changedStateVars.get( stateVarName ); String stateVarNewVal = changedStateVars.get( stateVarName );
subscription.handler.handleStateVariableEvent( stateVarName, stateVarNewVal ); subscription.handler.handleStateVariableEvent( stateVarName, stateVarNewVal );
} }
} }

32
source/net/yacy/upnp/devices/UPNPDevice.java
Unescape View File

@ -151,7 +151,7 @@ public class UPNPDevice {
* Access to the device icons definitions * Access to the device icons definitions
* @return a list containing DeviceIcon objects or null if no icons defined * @return a list containing DeviceIcon objects or null if no icons defined
*/ */
public List getDeviceIcons() { public List<DeviceIcon> getDeviceIcons() {
return deviceIcons; return deviceIcons;
} }
@ -163,8 +163,8 @@ public class UPNPDevice {
public ArrayList<UPNPDevice> getChildDevices() { public ArrayList<UPNPDevice> getChildDevices() {
if ( childDevices == null ) return null; if ( childDevices == null ) return null;
ArrayList<UPNPDevice> rtrVal = new ArrayList<UPNPDevice>(); ArrayList<UPNPDevice> rtrVal = new ArrayList<UPNPDevice>();
for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { for ( Iterator<UPNPDevice> itr = childDevices.iterator(); itr.hasNext(); ) {
UPNPDevice device = (UPNPDevice)itr.next(); UPNPDevice device = itr.next();
rtrVal.add( device ); rtrVal.add( device );
ArrayList<UPNPDevice> found = device.getChildDevices(); ArrayList<UPNPDevice> found = device.getChildDevices();
if ( found != null ) { if ( found != null ) {
@ -180,11 +180,11 @@ public class UPNPDevice {
* UPNPDevice objects for this device. * UPNPDevice objects for this device.
* @return the generated list or null if no child devices bound * @return the generated list or null if no child devices bound
*/ */
public List getTopLevelChildDevices() { public List<UPNPDevice> getTopLevelChildDevices() {
if ( childDevices == null ) return null; if ( childDevices == null ) return null;
List<UPNPDevice> rtrVal = new ArrayList<UPNPDevice>(); List<UPNPDevice> rtrVal = new ArrayList<UPNPDevice>();
for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { for ( Iterator<UPNPDevice> itr = childDevices.iterator(); itr.hasNext(); ) {
UPNPDevice device = (UPNPDevice)itr.next(); UPNPDevice device = itr.next();
rtrVal.add( device ); rtrVal.add( device );
} }
return rtrVal; return rtrVal;
@ -209,8 +209,8 @@ public class UPNPDevice {
if ( log.isDebugEnabled() ) log.debug( "searching for device URI:" + deviceURI ); if ( log.isDebugEnabled() ) log.debug( "searching for device URI:" + deviceURI );
if ( getDeviceType().equals( deviceURI ) ) return this; if ( getDeviceType().equals( deviceURI ) ) return this;
if ( childDevices == null ) return null; if ( childDevices == null ) return null;
for ( Iterator itr = childDevices.iterator(); itr.hasNext(); ) { for ( Iterator<UPNPDevice> itr = childDevices.iterator(); itr.hasNext(); ) {
UPNPDevice device = (UPNPDevice)itr.next(); UPNPDevice device = itr.next();
UPNPDevice found = device.getChildDevice( deviceURI ); UPNPDevice found = device.getChildDevice( deviceURI );
if ( found != null ) { if ( found != null ) {
return found; return found;
@ -223,7 +223,7 @@ public class UPNPDevice {
* Looks for all UPNP device service definitions objects * Looks for all UPNP device service definitions objects
* @return A list of all device services * @return A list of all device services
*/ */
public ArrayList getServices() { public ArrayList<UPNPService> getServices() {
if ( services == null ) return null; if ( services == null ) return null;
ArrayList<UPNPService> rtrVal = new ArrayList<UPNPService>(); ArrayList<UPNPService> rtrVal = new ArrayList<UPNPService>();
rtrVal.addAll( services ); rtrVal.addAll( services );
@ -238,8 +238,8 @@ public class UPNPDevice {
public UPNPService getService( String serviceURI ) { public UPNPService getService( String serviceURI ) {
if ( services == null ) return null; if ( services == null ) return null;
if ( log.isDebugEnabled() ) log.debug( "searching for service URI:" + serviceURI ); if ( log.isDebugEnabled() ) log.debug( "searching for service URI:" + serviceURI );
for ( Iterator itr = services.iterator(); itr.hasNext(); ) { for ( Iterator<UPNPService> itr = services.iterator(); itr.hasNext(); ) {
UPNPService service = (UPNPService)itr.next(); UPNPService service = itr.next();
if ( service.getServiceType().equals( serviceURI ) ) { if ( service.getServiceType().equals( serviceURI ) ) {
return service; return service;
} }
@ -255,8 +255,8 @@ public class UPNPDevice {
public UPNPService getServiceByID( String serviceID ) { public UPNPService getServiceByID( String serviceID ) {
if ( services == null ) return null; if ( services == null ) return null;
if ( log.isDebugEnabled() ) log.debug( "searching for service ID:" + serviceID ); if ( log.isDebugEnabled() ) log.debug( "searching for service ID:" + serviceID );
for ( Iterator itr = services.iterator(); itr.hasNext(); ) { for ( Iterator<UPNPService> itr = services.iterator(); itr.hasNext(); ) {
UPNPService service = (UPNPService)itr.next(); UPNPService service = itr.next();
if ( service.getServiceId().equals( serviceID ) ) { if ( service.getServiceId().equals( serviceID ) ) {
return service; return service;
} }
@ -271,12 +271,12 @@ public class UPNPDevice {
* @param serviceURI the URI of the service * @param serviceURI the URI of the service
* @return A matching List of UPNPService objects or null * @return A matching List of UPNPService objects or null
*/ */
public List getServices( String serviceURI ) { public List<UPNPService> getServices( String serviceURI ) {
if ( services == null ) return null; if ( services == null ) return null;
List<UPNPService> rtrVal = new ArrayList<UPNPService>(); List<UPNPService> rtrVal = new ArrayList<UPNPService>();
if ( log.isDebugEnabled() ) log.debug( "searching for services URI:" + serviceURI ); if ( log.isDebugEnabled() ) log.debug( "searching for services URI:" + serviceURI );
for ( Iterator itr = services.iterator(); itr.hasNext(); ) { for ( Iterator<UPNPService> itr = services.iterator(); itr.hasNext(); ) {
UPNPService service = (UPNPService)itr.next(); UPNPService service = itr.next();
if ( service.getServiceType().equals( serviceURI ) ) { if ( service.getServiceType().equals( serviceURI ) ) {
rtrVal.add( service ); rtrVal.add( service );
} }

4
source/net/yacy/upnp/impls/InternetGatewayDevice.java
Unescape View File

@ -268,8 +268,8 @@ public class InternetGatewayDevice {
} }
rtrVal = new InternetGatewayDevice[valid.size()]; rtrVal = new InternetGatewayDevice[valid.size()];
int i = 0; int i = 0;
for ( Iterator itr = valid.iterator(); itr.hasNext(); ) { for ( Iterator<InternetGatewayDevice> itr = valid.iterator(); itr.hasNext(); ) {
rtrVal[i++] = (InternetGatewayDevice)itr.next(); rtrVal[i++] = itr.next();
} }
} }

12
source/net/yacy/upnp/messages/ActionMessage.java
Unescape View File

@ -118,8 +118,8 @@ public class ActionMessage {
if ( serviceAction.getInputActionArguments() != null ) { if ( serviceAction.getInputActionArguments() != null ) {
// this action requires params so we just set them... // this action requires params so we just set them...
for ( Iterator itr = inputParameters.iterator(); itr.hasNext(); ) { for ( Iterator<InputParamContainer> itr = inputParameters.iterator(); itr.hasNext(); ) {
InputParamContainer container = (InputParamContainer)itr.next(); InputParamContainer container = itr.next();
body.append( "<" ).append( container.name ).append( ">" ).append( container.value ); body.append( "<" ).append( container.name ).append( ">" ).append( container.value );
body.append( "</" ).append( container.name ).append( ">" ); body.append( "</" ).append( container.name ).append( ">" );
} }
@ -235,7 +235,7 @@ public class ActionMessage {
* @return a list of required input parameters ServiceActionArgument objects for this message * @return a list of required input parameters ServiceActionArgument objects for this message
* or null if the message does not require any input params * or null if the message does not require any input params
*/ */
public List getInputParameterNames() { public List<String> getInputParameterNames() {
return serviceAction.getInputActionArgumentsNames(); return serviceAction.getInputActionArgumentsNames();
} }
@ -244,7 +244,7 @@ public class ActionMessage {
* @return a list of output parameters ServiceActionArgument objects for this message * @return a list of output parameters ServiceActionArgument objects for this message
* or null if the message does not contains any output params. * or null if the message does not contains any output params.
*/ */
public List getOutputParameterNames() { public List<String> getOutputParameterNames() {
return serviceAction.getOutputActionArgumentsNames(); return serviceAction.getOutputActionArgumentsNames();
} }
@ -296,8 +296,8 @@ public class ActionMessage {
if ( serviceAction.getInputActionArguments() == null ) throw new IllegalArgumentException( "No input parameters required for this message" ); if ( serviceAction.getInputActionArguments() == null ) throw new IllegalArgumentException( "No input parameters required for this message" );
ServiceActionArgument arg = serviceAction.getInputActionArgument( parameterName ); ServiceActionArgument arg = serviceAction.getInputActionArgument( parameterName );
if ( arg == null ) throw new IllegalArgumentException( "Wrong input argument name for this action:" + parameterName + " available parameters are : " + getInputParameterNames() ); 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(); ) { for ( Iterator<InputParamContainer> i = inputParameters.iterator(); i.hasNext(); ) {
InputParamContainer container = (InputParamContainer)i.next(); InputParamContainer container = i.next();
if ( container.name.equals( parameterName ) ) { if ( container.name.equals( parameterName ) ) {
container.value = parameterValue; container.value = parameterValue;
return this; return this;

6
source/net/yacy/upnp/messages/ActionResponse.java
Unescape View File

@ -72,7 +72,7 @@ public class ActionResponse {
return outArgumentsVals.get( actionArgumentName ); return outArgumentsVals.get( actionArgumentName );
} }
public Set getOutActionArgumentNames() { public Set<String> getOutActionArgumentNames() {
return outArguments.keySet(); return outArguments.keySet();
} }
@ -89,8 +89,8 @@ public class ActionResponse {
public String toString() { public String toString() {
StringBuffer rtrVal = new StringBuffer(); StringBuffer rtrVal = new StringBuffer();
for ( Iterator i = outArguments.keySet().iterator(); i.hasNext(); ) { for ( Iterator<String> i = outArguments.keySet().iterator(); i.hasNext(); ) {
String name = (String)i.next(); String name = i.next();
String value = outArgumentsVals.get( name ); String value = outArgumentsVals.get( name );
rtrVal.append( name ).append( "=" ).append( value ); rtrVal.append( name ).append( "=" ).append( value );
if ( i.hasNext() ) rtrVal.append( "\n" ); if ( i.hasNext() ) rtrVal.append( "\n" );

46
source/net/yacy/upnp/services/ServiceAction.java
Unescape View File

@ -58,11 +58,11 @@ public class ServiceAction {
protected String name; protected String name;
protected UPNPService parent; protected UPNPService parent;
private List orderedActionArguments; private List<ServiceActionArgument> orderedActionArguments;
private List orderedInputActionArguments; private List<ServiceActionArgument> orderedInputActionArguments;
private List orderedOutputActionArguments; private List<ServiceActionArgument> orderedOutputActionArguments;
private List orderedInputActionArgumentsNames; private List<String> orderedInputActionArgumentsNames;
private List orderedOutputActionArgumentsNames; private List<String> orderedOutputActionArgumentsNames;
protected ServiceAction() { protected ServiceAction() {
} }
@ -75,7 +75,7 @@ public class ServiceAction {
* The action in and out arguments ServiceActionArgument objects list * The action in and out arguments ServiceActionArgument objects list
* @return the list with ServiceActionArgument objects or null if the action has no params * @return the list with ServiceActionArgument objects or null if the action has no params
*/ */
public List getActionArguments() { public List<ServiceActionArgument> getActionArguments() {
return orderedActionArguments; return orderedActionArguments;
} }
@ -86,14 +86,14 @@ public class ServiceAction {
*/ */
public ServiceActionArgument getActionArgument( String argumentName ) { public ServiceActionArgument getActionArgument( String argumentName ) {
if ( orderedActionArguments == null ) return null; if ( orderedActionArguments == null ) return null;
for ( Iterator i = orderedActionArguments.iterator(); i.hasNext(); ) { for ( Iterator<ServiceActionArgument> i = orderedActionArguments.iterator(); i.hasNext(); ) {
ServiceActionArgument arg = (ServiceActionArgument)i.next(); ServiceActionArgument arg = i.next();
if ( arg.getName().equals( argumentName ) ) return arg; if ( arg.getName().equals( argumentName ) ) return arg;
} }
return null; return null;
} }
protected void setActionArguments( List orderedActionArguments ) { protected void setActionArguments( List<ServiceActionArgument> orderedActionArguments ) {
this.orderedActionArguments = orderedActionArguments; this.orderedActionArguments = orderedActionArguments;
orderedInputActionArguments = getListForActionArgument( orderedActionArguments, ServiceActionArgument.DIRECTION_IN ); orderedInputActionArguments = getListForActionArgument( orderedActionArguments, ServiceActionArgument.DIRECTION_IN );
orderedOutputActionArguments = getListForActionArgument( orderedActionArguments, ServiceActionArgument.DIRECTION_OUT ); 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 * @return a list containing input arguments ServiceActionArgument objects or null when nothing
* is needed for such operation * is needed for such operation
*/ */
public List getInputActionArguments() { public List<ServiceActionArgument> getInputActionArguments() {
return orderedInputActionArguments; return orderedInputActionArguments;
} }
@ -117,8 +117,8 @@ public class ServiceAction {
*/ */
public ServiceActionArgument getInputActionArgument( String argumentName ) { public ServiceActionArgument getInputActionArgument( String argumentName ) {
if ( orderedInputActionArguments == null ) return null; if ( orderedInputActionArguments == null ) return null;
for ( Iterator i = orderedInputActionArguments.iterator(); i.hasNext(); ) { for ( Iterator<ServiceActionArgument> i = orderedInputActionArguments.iterator(); i.hasNext(); ) {
ServiceActionArgument arg = (ServiceActionArgument)i.next(); ServiceActionArgument arg = i.next();
if ( arg.getName().equals( argumentName ) ) return arg; if ( arg.getName().equals( argumentName ) ) return arg;
} }
return null; return null;
@ -130,7 +130,7 @@ public class ServiceAction {
* @return a list containing output arguments ServiceActionArgument objects or null when nothing * @return a list containing output arguments ServiceActionArgument objects or null when nothing
* returned for such operation * returned for such operation
*/ */
public List getOutputActionArguments() { public List<ServiceActionArgument> getOutputActionArguments() {
return orderedOutputActionArguments; return orderedOutputActionArguments;
} }
@ -141,8 +141,8 @@ public class ServiceAction {
*/ */
public ServiceActionArgument getOutputActionArgument( String argumentName ) { public ServiceActionArgument getOutputActionArgument( String argumentName ) {
if ( orderedOutputActionArguments == null ) return null; if ( orderedOutputActionArguments == null ) return null;
for ( Iterator i = orderedOutputActionArguments.iterator(); i.hasNext(); ) { for ( Iterator<ServiceActionArgument> i = orderedOutputActionArguments.iterator(); i.hasNext(); ) {
ServiceActionArgument arg = (ServiceActionArgument)i.next(); ServiceActionArgument arg = i.next();
if ( arg.getName().equals( argumentName ) ) return arg; if ( arg.getName().equals( argumentName ) ) return arg;
} }
return null; return null;
@ -153,7 +153,7 @@ public class ServiceAction {
* @return a list containing input arguments names as Strings or null when nothing * @return a list containing input arguments names as Strings or null when nothing
* is needed for such operation * is needed for such operation
*/ */
public List getInputActionArgumentsNames() { public List<String> getInputActionArgumentsNames() {
return orderedInputActionArgumentsNames; return orderedInputActionArgumentsNames;
} }
@ -162,7 +162,7 @@ public class ServiceAction {
* @return a list containing output arguments names as Strings or null when nothing * @return a list containing output arguments names as Strings or null when nothing
* returned for such operation * returned for such operation
*/ */
public List getOutputActionArgumentsNames() { public List<String> getOutputActionArgumentsNames() {
return orderedOutputActionArgumentsNames; return orderedOutputActionArgumentsNames;
} }
@ -174,11 +174,11 @@ public class ServiceAction {
return name; return name;
} }
private List getListForActionArgument( List args, String direction ) { private List<ServiceActionArgument> getListForActionArgument( List<ServiceActionArgument> args, String direction ) {
if ( args == null ) return null; if ( args == null ) return null;
List<ServiceActionArgument> rtrVal = new ArrayList<ServiceActionArgument>(); List<ServiceActionArgument> rtrVal = new ArrayList<ServiceActionArgument>();
for ( Iterator itr = args.iterator(); itr.hasNext(); ) { for ( Iterator<ServiceActionArgument> itr = args.iterator(); itr.hasNext(); ) {
ServiceActionArgument actArg = (ServiceActionArgument)itr.next(); ServiceActionArgument actArg = itr.next();
if ( actArg.getDirection() == direction ) { if ( actArg.getDirection() == direction ) {
rtrVal.add( actArg ); rtrVal.add( actArg );
} }
@ -187,11 +187,11 @@ public class ServiceAction {
return rtrVal; return rtrVal;
} }
private List getListForActionArgumentNames( List args, String direction ) { private List<String> getListForActionArgumentNames( List<ServiceActionArgument> args, String direction ) {
if ( args == null ) return null; if ( args == null ) return null;
List<String> rtrVal = new ArrayList<String>(); List<String> rtrVal = new ArrayList<String>();
for ( Iterator itr = args.iterator(); itr.hasNext(); ) { for ( Iterator<ServiceActionArgument> itr = args.iterator(); itr.hasNext(); ) {
ServiceActionArgument actArg = (ServiceActionArgument)itr.next(); ServiceActionArgument actArg = itr.next();
if ( actArg.getDirection() == direction ) { if ( actArg.getDirection() == direction ) {
rtrVal.add( actArg.getName() ); rtrVal.add( actArg.getName() );
} }

6
source/net/yacy/upnp/services/ServiceStateVariable.java
Unescape View File

@ -144,7 +144,7 @@ public class ServiceStateVariable implements ServiceStateVariableTypes {
* The varialbe JAVA data type (using an UPNP->Java mapping) * The varialbe JAVA data type (using an UPNP->Java mapping)
* @return the class mapped * @return the class mapped
*/ */
public Class getDataTypeAsClass() { public Class<?> getDataTypeAsClass() {
return getDataTypeClassMapping( dataType ); return getDataTypeClassMapping( dataType );
} }
@ -152,7 +152,7 @@ public class ServiceStateVariable implements ServiceStateVariableTypes {
* A set of allowed values (String objects) for the variable * A set of allowed values (String objects) for the variable
* @return the allowed values or null if none * @return the allowed values or null if none
*/ */
public Set getAllowedvalues() { public Set<String> getAllowedvalues() {
return allowedvalues; return allowedvalues;
} }
@ -180,7 +180,7 @@ public class ServiceStateVariable implements ServiceStateVariableTypes {
return stepRangeValue; return stepRangeValue;
} }
public static Class getDataTypeClassMapping( String dataType ) { public static Class<?> getDataTypeClassMapping( String dataType ) {
int hash = dataType.hashCode(); int hash = dataType.hashCode();
if ( hash == UI1_INT ) return Short.class; if ( hash == UI1_INT ) return Short.class;
else if ( hash == UI2_INT ) return Integer.class; else if ( hash == UI2_INT ) return Integer.class;

4
source/net/yacy/upnp/services/UPNPService.java
Unescape View File

@ -149,7 +149,7 @@ public class UPNPService {
return UPNPServiceStateVariables.get( stateVariableName ); return UPNPServiceStateVariables.get( stateVariableName );
} }
public Iterator getAvailableActionsName() { public Iterator<String> getAvailableActionsName() {
lazyInitiate(); lazyInitiate();
return UPNPServiceActions.keySet().iterator(); return UPNPServiceActions.keySet().iterator();
} }
@ -159,7 +159,7 @@ public class UPNPService {
return UPNPServiceActions.keySet().size(); return UPNPServiceActions.keySet().size();
} }
public Iterator getAvailableStateVariableName() { public Iterator<String> getAvailableStateVariableName() {
lazyInitiate(); lazyInitiate();
return UPNPServiceStateVariables.keySet().iterator(); return UPNPServiceStateVariables.keySet().iterator();
} }

Write Preview
Loading…
Cancel
Save