diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java index a4d70bfc3..c528d8658 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLPreviewRenderer.java @@ -105,7 +105,7 @@ public class HTMLPreviewRenderer extends HTMLRenderer { String knownName = null; if (_user != null) - knownName = _user.getPetNameDB().getLocation(a.location).getName(); + knownName = _user.getPetNameDB().getByLocation(a.location).getName(); if (knownName != null) { _postBodyBuffer.append(' ').append(getSpan("summDetailAddrKnown")); _postBodyBuffer.append(sanitizeString(knownName)).append(""); @@ -134,7 +134,7 @@ public class HTMLPreviewRenderer extends HTMLRenderer { _postBodyBuffer.append("\">").append(sanitizeString(a.name)).append(""); if (a.description != null) _postBodyBuffer.append(": ").append(getSpan("summDetailArchiveDesc")).append(sanitizeString(a.description)).append(""); - if (null == _user.getPetNameDB().getLocation(a.location)) { + if (null == _user.getPetNameDB().getByLocation(a.location)) { _postBodyBuffer.append(" bookmark"); diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java index cb54d1c40..0909a229a 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/HTMLRenderer.java @@ -468,7 +468,7 @@ public class HTMLRenderer extends EventReceiverImpl { if ( (schema == null) || (location == null) ) return; PetName pn = null; if (_user != null) - pn = _user.getPetNameDB().getLocation(location); + pn = _user.getPetNameDB().getByLocation(location); if (pn != null) { _bodyBuffer.append(getSpan("addr")).append(sanitizeString(anchorText)).append(""); _bodyBuffer.append(getSpan("addrKnownName")).append("(").append(sanitizeString(pn.getName())).append(")"); @@ -633,7 +633,7 @@ public class HTMLRenderer extends EventReceiverImpl { PetName pn = null; if (_user != null) - pn = _user.getPetNameDB().getLocation(a.location); + pn = _user.getPetNameDB().getByLocation(a.location); if (pn != null) { _postBodyBuffer.append(' ').append(getSpan("summDetailAddrKnown")); _postBodyBuffer.append(sanitizeString(pn.getName())).append(""); @@ -662,7 +662,7 @@ public class HTMLRenderer extends EventReceiverImpl { _postBodyBuffer.append("\">").append(sanitizeString(a.name)).append(""); if (a.description != null) _postBodyBuffer.append(": ").append(getSpan("summDetailArchiveDesc")).append(sanitizeString(a.description)).append(""); - if (null == _user.getPetNameDB().getLocation(a.location)) { + if (null == _user.getPetNameDB().getByLocation(a.location)) { _postBodyBuffer.append(" bookmark it"); @@ -767,7 +767,7 @@ public class HTMLRenderer extends EventReceiverImpl { PetName pn = null; if ( (_entry != null) && (_user != null) ) - pn = _user.getPetNameDB().getLocation(_entry.getURI().getKeyHash().toBase64()); + pn = _user.getPetNameDB().getByLocation(_entry.getURI().getKeyHash().toBase64()); //if (knownName != null) // _preBodyBuffer.append("Pet name: ").append(sanitizeString(knownName)).append(" "); diff --git a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java index 86414c57c..07732f20d 100644 --- a/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java +++ b/apps/syndie/java/src/net/i2p/syndie/sml/RSSRenderer.java @@ -27,7 +27,7 @@ public class RSSRenderer extends HTMLRenderer { out.write(" " + urlPrefix + sanitizeXML(getEntryURL()) + "\n"); out.write(" " + urlPrefix + entry.getURI().toString() + "\n"); out.write(" " + getRFC822Date(entry.getURI().getEntryId()) + "\n"); - PetName pn = user.getPetNameDB().getLocation(entry.getURI().getKeyHash().toBase64()); + PetName pn = user.getPetNameDB().getByLocation(entry.getURI().getKeyHash().toBase64()); String author = pn.getName(); if (author == null) { BlogInfo info = archive.getBlogInfo(entry.getURI()); @@ -196,7 +196,7 @@ public class RSSRenderer extends HTMLRenderer { if ( (schema == null) || (location == null) ) return; PetName pn = null; if (_user != null) - pn = _user.getPetNameDB().getLocation(location); + pn = _user.getPetNameDB().getByLocation(location); if (pn != null) { _bodyBuffer.append(sanitizeString(anchorText)); } else { @@ -254,7 +254,7 @@ public class RSSRenderer extends HTMLRenderer { PetName pn = null; if (_user != null) - pn = _user.getPetNameDB().getLocation(a.location); + pn = _user.getPetNameDB().getByLocation(a.location); if (pn == null) { StringBuffer url = new StringBuffer(128); url.append("addresses.jsp?network="); diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java index c0e64de46..6b7fe835e 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveViewerBean.java @@ -100,7 +100,7 @@ public class ArchiveViewerBean { for (int i = 0; i < index.getNewestBlogCount(); i++) { Hash cur = index.getNewestBlog(i); - PetName pn = user.getPetNameDB().getLocation(cur.toBase64()); + PetName pn = user.getPetNameDB().getByLocation(cur.toBase64()); String knownName = null; if (pn != null) { knownName = pn.getName(); @@ -127,7 +127,7 @@ public class ArchiveViewerBean { Set blogs = index.getUniqueBlogs(); for (Iterator iter = blogs.iterator(); iter.hasNext(); ) { Hash cur = (Hash)iter.next(); - PetName pn = user.getPetNameDB().getLocation(cur.toBase64()); + PetName pn = user.getPetNameDB().getByLocation(cur.toBase64()); String knownName = null; if (pn != null) { knownName = pn.getName(); @@ -492,7 +492,7 @@ public class ArchiveViewerBean { PetNameDB db = user.getPetNameDB(); for (Iterator iter = db.getNames().iterator(); iter.hasNext(); ) { String name = (String)iter.next(); - PetName pn = db.getName(name); + PetName pn = db.getByName(name); if ("syndie".equals(pn.getNetwork()) && "syndieblog".equals(pn.getProtocol()) && pn.isMember(group)) { byte pnLoc[] = Base64.decode(pn.getLocation()); if (pnLoc != null) { @@ -515,7 +515,7 @@ public class ArchiveViewerBean { BlogURI uri = (BlogURI)uris.get(i); Hash k = uri.getKeyHash(); if (k == null) continue; - PetName pn = user.getPetNameDB().getLocation(k.toBase64()); + PetName pn = user.getPetNameDB().getByLocation(k.toBase64()); if ( (pn != null) && (pn.isMember("Ignore")) ) { uris.remove(i); i--; diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java index 53e911d37..c274715b1 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/PostBean.java @@ -99,7 +99,7 @@ public class PostBean { if (_log.shouldLog(Log.DEBUG)) _log.debug("Posted the entry " + uri.toString() + " (archive = " + _archive + ")"); if ( (uri != null) && BlogManager.instance().authorizeRemote(_user) ) { - PetName pn = _user.getPetNameDB().getName(_archive); + PetName pn = _user.getPetNameDB().getByName(_archive); if (_log.shouldLog(Log.DEBUG)) _log.debug("Archive to petname? " + pn + " (protocol: " + (pn != null ? pn.getProtocol() : "") + ")"); if ( (pn != null) && ("syndiearchive".equals(pn.getProtocol())) ) { diff --git a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java index 300605eb2..40447f11c 100644 --- a/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java +++ b/apps/syndie/java/src/net/i2p/syndie/web/RemoteArchiveBean.java @@ -62,7 +62,7 @@ public class RemoteArchiveBean { private boolean ignoreBlog(User user, Hash blog) { PetNameDB db = user.getPetNameDB(); - PetName pn = db.getLocation(blog.toBase64()); + PetName pn = db.getByLocation(blog.toBase64()); return ( (pn!= null) && (pn.isMember("Ignore")) ); } diff --git a/apps/syndie/jsp/_bodyindex.jsp b/apps/syndie/jsp/_bodyindex.jsp index ed3f51cb2..d997bbd2c 100644 --- a/apps/syndie/jsp/_bodyindex.jsp +++ b/apps/syndie/jsp/_bodyindex.jsp @@ -11,7 +11,7 @@ if (user.getAuthenticated() && (null != request.getParameter("action")) ) { group = "Ignore"; boolean unignore = ("Unignore blog".equals(request.getParameter("action"))); - PetName pn = user.getPetNameDB().getLocation(blog); + PetName pn = user.getPetNameDB().getByLocation(blog); String name = null; if (pn != null) name = pn.getName(); if (name == null) diff --git a/apps/syndie/jsp/addresses.jsp b/apps/syndie/jsp/addresses.jsp index 941c2c4a8..5e9835efe 100644 --- a/apps/syndie/jsp/addresses.jsp +++ b/apps/syndie/jsp/addresses.jsp @@ -20,7 +20,7 @@ if (!user.getAuthenticated()) { String action = request.getParameter("action"); if ( (action != null) && ("Change".equals(action)) ) { String oldPetname = request.getParameter("petname"); - PetName cur = names.getName(oldPetname); + PetName cur = names.getByName(oldPetname); if (cur != null) { cur.setName(request.getParameter("name")); cur.setNetwork(request.getParameter("network")); @@ -43,7 +43,7 @@ if (!user.getAuthenticated()) { %>Address updated<% } } else if ( (action != null) && ("Add".equals(action)) ) { - PetName cur = names.getName(request.getParameter("name")); + PetName cur = names.getByName(request.getParameter("name")); if (cur != null) { %>Address already exists<% } else { cur = new PetName(); cur.setName(request.getParameter("name")); @@ -63,7 +63,7 @@ if (!user.getAuthenticated()) { %>Address added<% } } else if ( (action != null) && ("Delete".equals(action)) ) { - PetName cur = names.getName(request.getParameter("name")); + PetName cur = names.getByName(request.getParameter("name")); if (cur != null) { if ( ("syndiearchive".equals(cur.getProtocol())) && (BlogManager.instance().authorizeRemote(user)) ) { BlogManager.instance().unscheduleSyndication(cur.getLocation()); @@ -90,7 +90,7 @@ if (!user.getAuthenticated()) { <% StringBuffer buf = new StringBuffer(128); for (Iterator iter = sorted.iterator(); iter.hasNext(); ) { - PetName name = names.getName((String)iter.next()); + PetName name = names.getByName((String)iter.next()); buf.append("
"); buf.append(""); buf.append(""); diff --git a/apps/syndie/jsp/post.jsp b/apps/syndie/jsp/post.jsp index 3b751a74c..86c19d92a 100644 --- a/apps/syndie/jsp/post.jsp +++ b/apps/syndie/jsp/post.jsp @@ -66,7 +66,7 @@ if (!user.getAuthenticated()) { PetNameDB db = user.getPetNameDB(); if (entryHeaders == null) entryHeaders = ""; for (Iterator iter = db.getNames().iterator(); iter.hasNext(); ) { - PetName pn = db.getName((String)iter.next()); + PetName pn = db.getByName((String)iter.next()); if ( (pn != null) && (pn.getIsPublic()) ) { entryHeaders = entryHeaders + '\n' + HTMLRenderer.HEADER_PETNAME + ": " + pn.getName() + "\t" + pn.getNetwork() + "\t" + pn.getProtocol() + "\t" + pn.getLocation(); @@ -107,7 +107,7 @@ PetNameDB db = user.getPetNameDB(); TreeSet names = new TreeSet(); for (Iterator iter = db.getNames().iterator(); iter.hasNext(); ) { String name = (String)iter.next(); - PetName pn = db.getName(name); + PetName pn = db.getByName(name); if ("syndiearchive".equals(pn.getProtocol())) names.add(pn.getName()); } diff --git a/apps/syndie/jsp/remote.jsp b/apps/syndie/jsp/remote.jsp index 7e7ad680c..0f79cbaa5 100644 --- a/apps/syndie/jsp/remote.jsp +++ b/apps/syndie/jsp/remote.jsp @@ -45,7 +45,7 @@ for (Iterator iter = user.getPetNameDB().iterator(); iter.hasNext(); ) { String location = request.getParameter("location"); String pn = request.getParameter("archivepetname"); if ( (pn != null) && (pn.trim().length() > 0) ) { - PetName pnval = user.getPetNameDB().getName(pn); + PetName pnval = user.getPetNameDB().getByName(pn); if (pnval != null) location = pnval.getLocation(); } remote.fetchIndex(user, request.getParameter("schema"), location, request.getParameter("proxyhost"), request.getParameter("proxyport")); diff --git a/core/java/src/net/i2p/client/naming/PetNameDB.java b/core/java/src/net/i2p/client/naming/PetNameDB.java index 255f98bfb..ed34586cd 100644 --- a/core/java/src/net/i2p/client/naming/PetNameDB.java +++ b/core/java/src/net/i2p/client/naming/PetNameDB.java @@ -16,7 +16,7 @@ public class PetNameDB { _names = Collections.synchronizedMap(new HashMap()); } - public PetName getName(String name) { return (PetName)_names.get(name); } + public PetName getByName(String name) { return (PetName)_names.get(name); } public void add(PetName pn) { _names.put(pn.getName(), pn); } public void clear() { _names.clear(); } public boolean contains(PetName pn) { return _names.containsValue(pn); } @@ -38,7 +38,7 @@ public class PetNameDB { return rv; } - public PetName getLocation(String location) { + public PetName getByLocation(String location) { if (location == null) return null; synchronized (_names) { for (Iterator iter = iterator(); iter.hasNext(); ) { diff --git a/core/java/src/net/i2p/client/naming/PetNameNamingService.java b/core/java/src/net/i2p/client/naming/PetNameNamingService.java index 5c820533b..fb57a3c02 100644 --- a/core/java/src/net/i2p/client/naming/PetNameNamingService.java +++ b/core/java/src/net/i2p/client/naming/PetNameNamingService.java @@ -51,7 +51,7 @@ public class PetNameNamingService extends NamingService { } public Destination lookup(String hostname) { - PetName name = _petnameDb.getName(hostname); + PetName name = _petnameDb.getByName(hostname); if (name != null && name.getNetwork().equalsIgnoreCase("i2p")) { return lookupBase64(name.getLocation()); } else { @@ -60,6 +60,6 @@ public class PetNameNamingService extends NamingService { } public String reverseLookup(Destination dest) { - return _petnameDb.getLocation(dest.toBase64()).getName(); + return _petnameDb.getByLocation(dest.toBase64()).getName(); } }