[freenet-cvs] r17889 - in trunk/plugins: Librarian MDNSDiscovery/com/strangeberry/jmdns/tools MDNSDiscovery/javax/jmdns TestGallery UPnP/org/cybergarage/http UPnP/org/cybergarage/upnp UPnP/org/cybergarage/upnp/control UPnP/org/cybergarage/upnp/device UPnP/org/cybergarage/upnp/event UPnP/org/cybergarage/upnp/ssdp UPnP/org/cybergarage/util UPnP/org/cybergarage/xml XMLLibrarian XMLSpider
jflesch at freenetproject.org
jflesch at freenetproject.org
Wed Feb 13 23:53:53 UTC 2008
Author: jflesch
Date: 2008-02-13 23:53:53 +0000 (Wed, 13 Feb 2008)
New Revision: 17889
Modified:
trunk/plugins/Librarian/Librarian.java
trunk/plugins/MDNSDiscovery/com/strangeberry/jmdns/tools/Browser.java
trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java
trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java
trunk/plugins/TestGallery/TestGallery.java
trunk/plugins/UPnP/org/cybergarage/http/HTTPServerList.java
trunk/plugins/UPnP/org/cybergarage/http/ParameterList.java
trunk/plugins/UPnP/org/cybergarage/upnp/ActionList.java
trunk/plugins/UPnP/org/cybergarage/upnp/AllowedValueList.java
trunk/plugins/UPnP/org/cybergarage/upnp/ArgumentList.java
trunk/plugins/UPnP/org/cybergarage/upnp/DeviceList.java
trunk/plugins/UPnP/org/cybergarage/upnp/IconList.java
trunk/plugins/UPnP/org/cybergarage/upnp/ServiceList.java
trunk/plugins/UPnP/org/cybergarage/upnp/ServiceStateTable.java
trunk/plugins/UPnP/org/cybergarage/upnp/control/ControlResponse.java
trunk/plugins/UPnP/org/cybergarage/upnp/device/InvalidDescriptionException.java
trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java
trunk/plugins/UPnP/org/cybergarage/upnp/event/PropertyList.java
trunk/plugins/UPnP/org/cybergarage/upnp/event/SubscriberList.java
trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
trunk/plugins/UPnP/org/cybergarage/util/ListenerList.java
trunk/plugins/UPnP/org/cybergarage/xml/AttributeList.java
trunk/plugins/UPnP/org/cybergarage/xml/NodeList.java
trunk/plugins/UPnP/org/cybergarage/xml/ParserException.java
trunk/plugins/XMLLibrarian/XMLLibrarian.java
trunk/plugins/XMLSpider/XMLSpider.java
Log:
Remove unused private methods + add serialVersionUID where needed in the plugins
Modified: trunk/plugins/Librarian/Librarian.java
===================================================================
--- trunk/plugins/Librarian/Librarian.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/Librarian/Librarian.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -33,14 +33,6 @@
goon = false;
}
- private String getArrayElement(String[] array, int element) {
- try {
- return array[element];
- } catch (Exception e) {
- //e.printStackTrace();
- return "";
- }
- }
public String handleHTTPPut(HTTPRequest request) throws PluginHTTPException {
return null;
}
@@ -48,26 +40,6 @@
return null;
}
- private HashMap getElements(String path) {
- String[] getelements = getArrayElement(path.split("\\?"),1).split("\\&");
- HashMap ret = new HashMap();
- for (int i = 0; i < getelements.length ; i++) {
- int eqpos = getelements[i].indexOf("=");
- if (eqpos < 1)
- // Unhandled so far
- continue;
-
- String key = getelements[i].substring(0, eqpos);
- String value = getelements[i].substring(eqpos + 1);
-
- ret.put(key, value);
- /*if (getelements[i].startsWith("page="))
- page = Integer.parseInt(getelements[i].substring("page=".length()));
- */
- }
- return ret;
- }
-
private void appendDefaultPageStart(StringBuffer out, String stylesheet) {
out.append("<HTML><HEAD><TITLE>" + plugName + "</TITLE>");
if(stylesheet != null)
@@ -79,11 +51,7 @@
private void appendDefaultPageEnd(StringBuffer out) {
out.append("</CENTER></BODY></HTML>");
}
-
- private void appendDefaultPostFields(StringBuffer out) {
- appendDefaultPostFields(out, "", "");
- }
-
+
private void appendDefaultPostFields(StringBuffer out, String search, String index) {
search = HTMLEncoder.encode(search);
index = HTMLEncoder.encode(index);
Modified: trunk/plugins/MDNSDiscovery/com/strangeberry/jmdns/tools/Browser.java
===================================================================
--- trunk/plugins/MDNSDiscovery/com/strangeberry/jmdns/tools/Browser.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/MDNSDiscovery/com/strangeberry/jmdns/tools/Browser.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -32,7 +32,8 @@
* @version %I%, %G%
*/
public class Browser extends JFrame implements ServiceListener, ServiceTypeListener, ListSelectionListener {
- JmDNS jmdns;
+ private static final long serialVersionUID = 9039623753775294448L;
+ JmDNS jmdns;
Vector headers;
String type;
DefaultListModel types;
@@ -237,7 +238,8 @@
* Table data.
*/
class ServiceTableModel extends AbstractTableModel {
- public String getColumnName(int column) {
+ private static final long serialVersionUID = -2699106046848786311L;
+ public String getColumnName(int column) {
switch (column) {
case 0: return "service";
case 1: return "address";
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/JmDNS.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -721,44 +721,6 @@
}
/**
- * Generate a possibly unique name for a host using the information we
- * have in the cache.
- *
- * @return returns true, if the name of the host had to be changed.
- */
- private boolean makeHostNameUnique(DNSRecord.Address host)
- {
- String originalName = host.getName();
-
- boolean collision;
- do
- {
- collision = false;
-
- // Check for collision in cache
- for (DNSCache.CacheNode j = cache.find(host.getName().toLowerCase()); j != null; j = j.next())
- {
- if (false)
- {
- host.name = incrementName(host.getName());
- collision = true;
- break;
- }
- }
- }
- while (collision);
-
- if (originalName.equals(host.getName()))
- {
- return false;
- }
- else
- {
- return true;
- }
- }
-
- /**
* Generate a possibly unique name for a service using the information we
* have in the cache.
*
Modified: trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java
===================================================================
--- trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/MDNSDiscovery/javax/jmdns/ServiceEvent.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -14,7 +14,8 @@
*/
public class ServiceEvent extends EventObject
{
- /**
+ private static final long serialVersionUID = -4428198292275178307L;
+ /**
* The type name of the service.
*/
private String type;
Modified: trunk/plugins/TestGallery/TestGallery.java
===================================================================
--- trunk/plugins/TestGallery/TestGallery.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/TestGallery/TestGallery.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -1,7 +1,6 @@
package plugins.TestGallery;
-import java.util.HashMap;
import java.util.Random;
import freenet.client.HighLevelSimpleClient;
@@ -40,26 +39,6 @@
return null;
}
- private HashMap getElements(String path) {
- String[] getelements = getArrayElement(path.split("\\?"),1).split("\\&");
- HashMap ret = new HashMap();
- for (int i = 0; i < getelements.length ; i++) {
- int eqpos = getelements[i].indexOf("=");
- if (eqpos < 1)
- // Unhandled so far
- continue;
-
- String key = getelements[i].substring(0, eqpos);
- String value = getelements[i].substring(eqpos + 1);
-
- ret.put(key, value);
- /*if (getelements[i].startsWith("page="))
- page = Integer.parseInt(getelements[i].substring("page=".length()));
- */
- }
- return ret;
- }
-
private String mkDefaultPage() {
StringBuffer out = new StringBuffer();
out.append("<HTML><HEAD><TITLE>" + plugName + "</TITLE></HEAD><BODY>\n");
Modified: trunk/plugins/UPnP/org/cybergarage/http/HTTPServerList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/http/HTTPServerList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/http/HTTPServerList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -25,6 +25,8 @@
// Constructor
////////////////////////////////////////////////
+ private static final long serialVersionUID = 2379889735659369065L;
+
public HTTPServerList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/http/ParameterList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/http/ParameterList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/http/ParameterList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -19,6 +19,8 @@
public class ParameterList extends Vector
{
+ private static final long serialVersionUID = -6026765325018137641L;
+
public ParameterList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ActionList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ActionList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ActionList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -22,7 +22,8 @@
////////////////////////////////////////////////
// Constants
////////////////////////////////////////////////
-
+
+ private static final long serialVersionUID = 1965922721316119846L;
public final static String ELEM_NAME = "actionList";
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/AllowedValueList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/AllowedValueList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/AllowedValueList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -25,6 +25,7 @@
// Constants
////////////////////////////////////////////////
+ private static final long serialVersionUID = 5740394642751180992L;
public final static String ELEM_NAME = "allowedValueList";
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ArgumentList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ArgumentList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ArgumentList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -23,6 +23,7 @@
// Constants
////////////////////////////////////////////////
+ private static final long serialVersionUID = -5412792105767389170L;
public final static String ELEM_NAME = "argumentList";
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/DeviceList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/DeviceList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/DeviceList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -23,6 +23,7 @@
// Constants
////////////////////////////////////////////////
+ private static final long serialVersionUID = 3773784061607435126L;
public final static String ELEM_NAME = "deviceList";
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/IconList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/IconList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/IconList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -23,6 +23,7 @@
// Constants
////////////////////////////////////////////////
+ private static final long serialVersionUID = -1097238335037012991L;
public final static String ELEM_NAME = "iconList";
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ServiceList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ServiceList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ServiceList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -25,6 +25,7 @@
// Constants
////////////////////////////////////////////////
+ private static final long serialVersionUID = 6372904993975135597L;
public final static String ELEM_NAME = "serviceList";
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ServiceStateTable.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ServiceStateTable.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ServiceStateTable.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -23,6 +23,7 @@
// Constants
////////////////////////////////////////////////
+ private static final long serialVersionUID = 7626909231678469365L;
public final static String ELEM_NAME = "serviceStateTable";
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/control/ControlResponse.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/control/ControlResponse.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/control/ControlResponse.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -102,11 +102,6 @@
return faultNode;
}
- private Node createFaultResponseNode(int errCode)
- {
- return createFaultResponseNode(errCode, UPnPStatus.code2String(errCode));
- }
-
////////////////////////////////////////////////
// UPnP Error
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/device/InvalidDescriptionException.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/device/InvalidDescriptionException.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/device/InvalidDescriptionException.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -19,6 +19,8 @@
public class InvalidDescriptionException extends Exception
{
+ private static final long serialVersionUID = -3144583349586910509L;
+
public InvalidDescriptionException()
{
super();
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/event/NotifyRequest.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -154,19 +154,6 @@
return propSetNode;
}
- private Node getVariableNode()
- {
- Node rootNode = getEnvelopeNode();
- if (rootNode == null)
- return null;
- if (rootNode.hasNodes() == false)
- return null;
- Node propNode = rootNode.getNode(0);
- if (propNode.hasNodes() == false)
- return null;
- return propNode.getNode(0);
- }
-
// Thanks for Giordano Sassaroli <sassarol at cefriel.it> (09/08/03)
private Property getProperty(Node varNode)
{
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/event/PropertyList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/event/PropertyList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/event/PropertyList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -23,6 +23,7 @@
// Constants
////////////////////////////////////////////////
+ private static final long serialVersionUID = 8718064210738306226L;
public final static String ELEM_NAME = "PropertyList";
////////////////////////////////////////////////
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/event/SubscriberList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/event/SubscriberList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/event/SubscriberList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -25,6 +25,8 @@
// Constructor
////////////////////////////////////////////////
+ private static final long serialVersionUID = -648427977601494972L;
+
public SubscriberList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -27,6 +27,8 @@
// Constructor
////////////////////////////////////////////////
+ private static final long serialVersionUID = -7066290881503106399L;
+
public SSDPNotifySocketList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -29,6 +29,8 @@
// Constructor
////////////////////////////////////////////////
+ private static final long serialVersionUID = 4509857798038125744L;
+
public SSDPSearchResponseSocketList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -30,6 +30,8 @@
// Constructor
////////////////////////////////////////////////
+ private static final long serialVersionUID = 4071292828166415028L;
+
public SSDPSearchSocketList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/util/ListenerList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/util/ListenerList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/util/ListenerList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -19,6 +19,8 @@
public class ListenerList extends Vector
{
+ private static final long serialVersionUID = 8039231561720446173L;
+
public boolean add(Object obj)
{
if (0 <= indexOf(obj))
Modified: trunk/plugins/UPnP/org/cybergarage/xml/AttributeList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/xml/AttributeList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/xml/AttributeList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -19,6 +19,8 @@
public class AttributeList extends Vector
{
+ private static final long serialVersionUID = -5516389508555401104L;
+
public AttributeList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/xml/NodeList.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/xml/NodeList.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/xml/NodeList.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -19,6 +19,8 @@
public class NodeList extends Vector
{
+ private static final long serialVersionUID = 1528884682346143213L;
+
public NodeList()
{
}
Modified: trunk/plugins/UPnP/org/cybergarage/xml/ParserException.java
===================================================================
--- trunk/plugins/UPnP/org/cybergarage/xml/ParserException.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/UPnP/org/cybergarage/xml/ParserException.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -19,6 +19,8 @@
public class ParserException extends Exception
{
+ private static final long serialVersionUID = 7443033796560597360L;
+
public ParserException(Exception e)
{
super(e);
Modified: trunk/plugins/XMLLibrarian/XMLLibrarian.java
===================================================================
--- trunk/plugins/XMLLibrarian/XMLLibrarian.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/XMLLibrarian/XMLLibrarian.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -775,35 +775,6 @@
return fileuris;
}
- /**
- * Gets the key of the matched uri.
- * @param id id of the uri which contains the searched word
- * @return key of the uri
- * @throws Exception
- */
- private String getURI(String id) throws Exception
- {
- try{
- DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
- Document doc = docBuilder.parse(DEFAULT_FILE);
- Element root = doc.getDocumentElement();
- NodeList fileList = root.getElementsByTagName("file");
- for(int i = 0;i<fileList.getLength();i++){
- Element file = (Element) fileList.item(i);
- String fileId = file.getAttribute("id");
- if(fileId.equals(id)) return file.getAttribute("key");
- }
-
- }
- catch(Exception e){
- Logger.error(this, "uri for id ="+id+" could not be retrieved "+e.toString(), e);
-
- }
- return "not available";
- }
-
-
public void runPlugin(PluginRespirator pr) {
this.pr = pr;
this.test = true;
Modified: trunk/plugins/XMLSpider/XMLSpider.java
===================================================================
--- trunk/plugins/XMLSpider/XMLSpider.java 2008-02-13 23:53:32 UTC (rev 17888)
+++ trunk/plugins/XMLSpider/XMLSpider.java 2008-02-13 23:53:53 UTC (rev 17889)
@@ -530,7 +530,7 @@
}
private class TooBigIndexException extends Exception {
-
+ private static final long serialVersionUID = -6172560811504794914L;
}
/**
More information about the cvs
mailing list