[freenet-cvs] r17885 - in trunk/plugins: MDNSDiscovery/javax/jmdns SNMP/snmplib UPnP/org/cybergarage/http UPnP/org/cybergarage/upnp UPnP/org/cybergarage/upnp/control UPnP/org/cybergarage/upnp/event UPnP/org/cybergarage/upnp/ssdp XMLLibrarian
jflesch at freenetproject.org
jflesch at freenetproject.org
Wed Feb 13 23:04:20 UTC 2008
Author: jflesch
Date: 2008-02-13 23:04:20 +0000 (Wed, 13 Feb 2008)
New Revision: 17885
Modified:
trunk/plugins/MDNSDiscovery/javax/jmdns/DNSCache.java
trunk/plugins/MDNSDiscovery/javax/jmdns/DNSEntry.java
trunk/plugins/MDNSDiscovery/javax/jmdns/DNSQuestion.java
trunk/plugins/MDNSDiscovery/javax/jmdns/DNSRecord.java
trunk/plugins/MDNSDiscovery/javax/jmdns/DNSState.java
trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java
trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java
trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceInfo.java
trunk/plugins/SNMP/snmplib/SNMPAgent.java
trunk/plugins/UPnP/org/cybergarage/http/HTTP.java
trunk/plugins/UPnP/org/cybergarage/http/HTTPPacket.java
trunk/plugins/UPnP/org/cybergarage/http/HTTPRequest.java
trunk/plugins/UPnP/org/cybergarage/upnp/Device.java
trunk/plugins/UPnP/org/cybergarage/upnp/Service.java
trunk/plugins/UPnP/org/cybergarage/upnp/StateVariable.java
trunk/plugins/UPnP/org/cybergarage/upnp/control/QueryRequest.java
trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java
trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java
trunk/plugins/XMLLibrarian/XMLLibrarian.java
Log:
Remove unused fields and some useless calls to get[...]() functionsin plugins
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/DNSCache.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/DNSCache.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/DNSCache.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -8,7 +8,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.logging.Logger;
/**
* A table of DNS entries. This is a hash table which
@@ -43,7 +42,6 @@
*/
class DNSCache
{
- private static Logger logger = Logger.getLogger(DNSCache.class.toString());
// Implementation note:
// We might completely hide the existence of CacheNode's in a future version
// of DNSCache. But this will require to implement two (inner) classes for
@@ -73,7 +71,6 @@
*/
public static class CacheNode
{
- private static Logger logger = Logger.getLogger(CacheNode.class.toString());
private DNSEntry value;
private CacheNode next;
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/DNSEntry.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/DNSEntry.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/DNSEntry.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -5,8 +5,6 @@
package plugins.MDNSDiscovery.javax.jmdns;
-import java.util.logging.Logger;
-
/**
* DNS entry with a name, type, and class. This is the base
* class for questions and records.
@@ -16,7 +14,6 @@
*/
class DNSEntry
{
- private static Logger logger = Logger.getLogger(DNSEntry.class.toString());
String key;
String name;
int type;
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/DNSQuestion.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/DNSQuestion.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/DNSQuestion.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -5,8 +5,6 @@
package plugins.MDNSDiscovery.javax.jmdns;
-import java.util.logging.Logger;
-
/**
* A DNS question.
*
@@ -15,8 +13,6 @@
*/
final class DNSQuestion extends DNSEntry
{
- private static Logger logger = Logger.getLogger(DNSQuestion.class.toString());
-
/**
* Create a question.
*/
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/DNSRecord.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/DNSRecord.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/DNSRecord.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -397,7 +397,6 @@
*/
static class Pointer extends DNSRecord
{
- private static Logger logger = Logger.getLogger(Pointer.class.toString());
String alias;
Pointer(String name, int type, int clazz, int ttl, String alias)
@@ -448,7 +447,6 @@
static class Text extends DNSRecord
{
- private static Logger logger = Logger.getLogger(Text.class.toString());
byte text[];
Text(String name, int type, int clazz, int ttl, byte text[])
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/DNSState.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/DNSState.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/DNSState.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -5,7 +5,6 @@
package plugins.MDNSDiscovery.javax.jmdns;
import java.util.ArrayList;
-import java.util.logging.Logger;
/**
* DNSState defines the possible states for services registered with JmDNS.
@@ -15,8 +14,6 @@
*/
public class DNSState implements Comparable
{
- private static Logger logger = Logger.getLogger(DNSState.class.toString());
-
private final String name;
/**
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -729,7 +729,6 @@
private boolean makeHostNameUnique(DNSRecord.Address host)
{
String originalName = host.getName();
- long now = System.currentTimeMillis();
boolean collision;
do
@@ -739,7 +738,6 @@
// Check for collision in cache
for (DNSCache.CacheNode j = cache.find(host.getName().toLowerCase()); j != null; j = j.next())
{
- DNSRecord a = (DNSRecord) j.getValue();
if (false)
{
host.name = incrementName(host.getName());
@@ -1756,8 +1754,6 @@
{
try
{
- long now = System.currentTimeMillis();
- long expirationTime = now + 1; //=now+DNSConstants.KNOWN_ANSWER_TTL;
boolean isUnicast = (port != DNSConstants.MDNS_PORT);
@@ -2484,7 +2480,6 @@
*/
private static class ServiceCollector implements ServiceListener
{
- private static Logger logger = Logger.getLogger(ServiceCollector.class.toString());
/**
* A set of collected service instance names.
*/
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -5,7 +5,6 @@
package plugins.MDNSDiscovery.javax.jmdns;
import java.util.EventObject;
-import java.util.logging.Logger;
/**
* ServiceEvent.
@@ -15,7 +14,6 @@
*/
public class ServiceEvent extends EventObject
{
- private static Logger logger = Logger.getLogger(ServiceEvent.class.toString());
/**
* The type name of the service.
*/
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceInfo.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceInfo.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceInfo.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -12,7 +12,6 @@
import java.util.Hashtable;
import java.util.TimerTask;
import java.util.Vector;
-import java.util.logging.Logger;
/**
* JmDNS service information.
@@ -22,7 +21,6 @@
*/
public class ServiceInfo implements DNSListener
{
- private static Logger logger = Logger.getLogger(ServiceInfo.class.toString());
public final static byte[] NO_VALUE = new byte[0];
JmDNS dns;
Modified: trunk/plugins/SNMP/snmplib/SNMPAgent.java
===================================================================
--- trunk/plugins/SNMP/snmplib/SNMPAgent.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/SNMP/snmplib/SNMPAgent.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -293,7 +293,6 @@
return replyStart(rc, 0, 0);
}
private BEREncoder replyStart(RequestContainer rc, int errStatus, int errIndex) /* throws SnmpTooBigException */ {
- int replyLength = 0;
BEREncoder be = new BEREncoder();
be.startSequence(); // whole pkg
be.putInteger(0); // version
Modified: trunk/plugins/UPnP/org/cybergarage/http/HTTP.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/http/HTTP.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/http/HTTP.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -105,7 +105,7 @@
public static final boolean isAbsoluteURL(String urlStr)
{
try {
- URL url = new URL(urlStr);
+ new URL(urlStr);
return true;
}
catch (Exception e) {
Modified: trunk/plugins/UPnP/org/cybergarage/http/HTTPPacket.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/http/HTTPPacket.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/http/HTTPPacket.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -642,7 +642,7 @@
// Skip bytes
if (strToken.hasMoreTokens() == false)
return range;
- String bytesStr = strToken.nextToken(" ");
+ strToken.nextToken(" ");
// Get first-byte-pos
if (strToken.hasMoreTokens() == false)
return range;
Modified: trunk/plugins/UPnP/org/cybergarage/http/HTTPRequest.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/http/HTTPRequest.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/http/HTTPRequest.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -167,7 +167,6 @@
String uri = getURI();
if (uri == null)
return paramList;
- int uriLen = uri.length();
int paramIdx = uri.indexOf('?');
if (paramIdx < 0)
return paramList;
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/Device.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/Device.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/Device.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -1533,7 +1533,7 @@
{
String callback = subReq.getCallback();
try {
- URL url = new URL(callback);
+ new URL(callback);
}
catch (Exception e) {
upnpBadSubscriptionRecieved(subReq, HTTPStatus.PRECONDITION_FAILED);
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/Service.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/Service.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/Service.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -321,7 +321,6 @@
private Node getSCPDNode()
{
- Node serviceNode = getServiceNode();
ServiceData data = getServiceData();
Node scpdNode = data.getSCPDNode();
if (scpdNode != null)
@@ -632,7 +631,6 @@
String host = sub.getDeliveryHost();
int port = sub.getDeliveryPort();
- String bindAddr = sub.getInterfaceAddress();
NotifyRequest notifyReq = new NotifyRequest();
notifyReq.setRequest(sub, varName, value);
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/StateVariable.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/StateVariable.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/StateVariable.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -239,7 +239,6 @@
Node valueListNode = getStateVariableNode().getNode(AllowedValueList.ELEM_NAME);
if (valueListNode == null)
return valueList;
- Node serviceNode = getServiceNode();
int nNode = valueListNode.getNNodes();
for (int n=0; n<nNode; n++) {
Node node = valueListNode.getNode(n);
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/control/QueryRequest.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/control/QueryRequest.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/control/QueryRequest.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -74,8 +74,6 @@
{
Service service = stateVar.getService();
- String ctrlURL = service.getControlURL();
-
setRequestHost(service);
setEnvelopeNode(SOAP.createEnvelopeBodyNode());
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -115,7 +115,6 @@
public boolean setRequest(Subscriber sub, String varName, String value)
{
- String callback = sub.getDeliveryURL();
String sid = sub.getSID();
long notifyCnt = sub.getNotifyCount();
String host = sub.getDeliveryHost();
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocket.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -30,12 +30,6 @@
public class SSDPSearchSocket extends HTTPMUSocket implements Runnable
{
- private boolean useIPv6Address;
-
- ////////////////////////////////////////////////
- // Constructor
- ////////////////////////////////////////////////
-
public SSDPSearchSocket()
{
}
@@ -52,10 +46,8 @@
public boolean open(String bindAddr)
{
String addr = SSDP.ADDRESS;
- useIPv6Address = false;
if (HostInterface.isIPv6Address(bindAddr) == true) {
addr = SSDP.getIPv6Address();
- useIPv6Address = true;
}
return open(addr, SSDP.PORT, bindAddr);
}
Modified: trunk/plugins/XMLLibrarian/XMLLibrarian.java
===================================================================
--- trunk/plugins/XMLLibrarian/XMLLibrarian.java 2008-02-13 23:02:14 UTC (rev 17884)
+++ trunk/plugins/XMLLibrarian/XMLLibrarian.java 2008-02-13 23:04:20 UTC (rev 17885)
@@ -117,7 +117,7 @@
out.append("<HTML><HEAD><TITLE>" + plugName + "</TITLE>");
if(stylesheet != null)
out.append("<link href=\""+stylesheet+"\" type=\"text/css\" rel=\"stylesheet\" />");
- String s = "<script type=\"text/javascript\">"+"function reloadPage(){ window.location.reload()}</script>";
+ //String s = "<script type=\"text/javascript\">"+"function reloadPage(){ window.location.reload()}</script>";
//out.append(s);
out.append("</HEAD><BODY>\n");
out.append("<CENTER><H1>" + plugName + "</H1><BR/><BR/><BR/>\n");
@@ -827,12 +827,11 @@
*/
public class LibrarianHandler extends DefaultHandler {
// now we need to adapt this to read subindexing
- private Locator locator = null;
private boolean found_match ;
public LibrarianHandler() throws Exception{
}
public void setDocumentLocator(Locator value) {
- locator = value;
+
}
public void endDocument() throws SAXException{}
@@ -928,25 +927,25 @@
String key = attrs.getValue("key");
int l = attrs.getLength();
String title;
- synchronized(this){
- if (l>=3 )
- {
- try{
- title = attrs.getValue("title");
-// FileWriter outp = new FileWriter("logfile",true);
-// outp.write("found title "+title+" == \n");
-// outp.close();
- titles.put(id,title);
+ synchronized(this){
+ if (l>=3 )
+ {
+ try{
+ title = attrs.getValue("title");
+// FileWriter outp = new FileWriter("logfile",true);
+// outp.write("found title "+title+" == \n");
+// outp.close();
+ titles.put(id,title);
+ }
+ catch(Exception e){
+ Logger.error(this, "Index Format not compatible "+e.toString(), e);
+ }
+ }
+
+ uris.put(id,key);
}
- catch(Exception e){
- Logger.error(this, "Index Format not compatible "+e.toString(), e);
- }
- }
-
- uris.put(id,key);
+ //String[] words = (String[]) uris.values().toArray(new String[uris.size()]);
}
- String[] words = (String[]) uris.values().toArray(new String[uris.size()]);
- }
catch(Exception e){Logger.error(this,"File id and key could not be retrieved. May be due to format clash",e);}
}
}
More information about the cvs
mailing list