projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
45f92ec
)
Suppress some warnings about variables hiding other variables.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 13 Sep 2011 08:30:19 +0000
(10:30 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 13 Sep 2011 08:32:55 +0000
(10:32 +0200)
src/main/java/net/pterodactylus/sone/core/Core.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/core/Options.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/data/Sone.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/text/PartContainer.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/SearchPage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
c8d7588
..
0eaf296
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-696,6
+696,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
public List<Reply> getReplies(Post post) {
Set<Sone> sones = getSones();
*/
public List<Reply> getReplies(Post post) {
Set<Sone> sones = getSones();
+ @SuppressWarnings("hiding")
List<Reply> replies = new ArrayList<Reply>();
for (Sone sone : sones) {
for (Reply reply : sone.getReplies()) {
List<Reply> replies = new ArrayList<Reply>();
for (Sone sone : sones) {
for (Reply reply : sone.getReplies()) {
@@
-788,6
+789,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return All bookmarked posts
*/
public Set<Post> getBookmarkedPosts() {
* @return All bookmarked posts
*/
public Set<Post> getBookmarkedPosts() {
+ @SuppressWarnings("hiding")
Set<Post> posts = new HashSet<Post>();
synchronized (bookmarkedPosts) {
for (String bookmarkedPostId : bookmarkedPosts) {
Set<Post> posts = new HashSet<Post>();
synchronized (bookmarkedPosts) {
for (String bookmarkedPostId : bookmarkedPosts) {
@@
-1254,6
+1256,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/* load posts. */
}
/* load posts. */
+ @SuppressWarnings("hiding")
Set<Post> posts = new HashSet<Post>();
while (true) {
String postPrefix = sonePrefix + "/Posts/" + posts.size();
Set<Post> posts = new HashSet<Post>();
while (true) {
String postPrefix = sonePrefix + "/Posts/" + posts.size();
@@
-1276,6
+1279,7
@@
public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/* load replies. */
}
/* load replies. */
+ @SuppressWarnings("hiding")
Set<Reply> replies = new HashSet<Reply>();
while (true) {
String replyPrefix = sonePrefix + "/Replies/" + replies.size();
Set<Reply> replies = new HashSet<Reply>();
while (true) {
String replyPrefix = sonePrefix + "/Replies/" + replies.size();
diff --git
a/src/main/java/net/pterodactylus/sone/core/Options.java
b/src/main/java/net/pterodactylus/sone/core/Options.java
index
1bdf21f
..
6a945b9
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Options.java
@@
-194,7
+194,7
@@
public class Options {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public boolean validate(T value) {
+ public boolean validate(
@SuppressWarnings("hiding")
T value) {
return (validator == null) || (value == null) || validator.validate(value);
}
return (validator == null) || (value == null) || validator.validate(value);
}
diff --git
a/src/main/java/net/pterodactylus/sone/data/Sone.java
b/src/main/java/net/pterodactylus/sone/data/Sone.java
index
3477346
..
fa3d78f
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/
src/main/java/net/pterodactylus/sone/data/Sone.java
@@
-658,6
+658,7
@@
public class Sone implements Fingerprintable, Comparable<Sone> {
}
fingerprint.append(")");
}
fingerprint.append(")");
+ @SuppressWarnings("hiding")
List<Reply> replies = new ArrayList<Reply>(getReplies());
Collections.sort(replies, Reply.TIME_COMPARATOR);
fingerprint.append("Replies(");
List<Reply> replies = new ArrayList<Reply>(getReplies());
Collections.sort(replies, Reply.TIME_COMPARATOR);
fingerprint.append("Replies(");
@@
-666,6
+667,7
@@
public class Sone implements Fingerprintable, Comparable<Sone> {
}
fingerprint.append(')');
}
fingerprint.append(')');
+ @SuppressWarnings("hiding")
List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
Collections.sort(likedPostIds);
fingerprint.append("LikedPosts(");
List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
Collections.sort(likedPostIds);
fingerprint.append("LikedPosts(");
@@
-674,6
+676,7
@@
public class Sone implements Fingerprintable, Comparable<Sone> {
}
fingerprint.append(')');
}
fingerprint.append(')');
+ @SuppressWarnings("hiding")
List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
Collections.sort(likedReplyIds);
fingerprint.append("LikedReplies(");
List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
Collections.sort(likedReplyIds);
fingerprint.append("LikedReplies(");
diff --git
a/src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java
b/src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java
index
1d57454
..
37d049a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java
+++ b/
src/main/java/net/pterodactylus/sone/freenet/SimpleFieldSetBuilder.java
@@
-67,7
+67,7
@@
public class SimpleFieldSetBuilder {
* The simple field set to copy
* @return This simple field set builder
*/
* The simple field set to copy
* @return This simple field set builder
*/
- public SimpleFieldSetBuilder put(SimpleFieldSet simpleFieldSet) {
+ public SimpleFieldSetBuilder put(
@SuppressWarnings("hiding")
SimpleFieldSet simpleFieldSet) {
this.simpleFieldSet.putAllOverwrite(simpleFieldSet);
return this;
}
this.simpleFieldSet.putAllOverwrite(simpleFieldSet);
return this;
}
diff --git
a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
index
3c97e55
..
803bc32
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/
src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@
-178,6
+178,7
@@
public class IdentityManager extends AbstractService {
Map<OwnIdentity, Map<String, Identity>> oldIdentities = Collections.emptyMap();
while (!shouldStop()) {
Map<OwnIdentity, Map<String, Identity>> currentIdentities = new HashMap<OwnIdentity, Map<String, Identity>>();
Map<OwnIdentity, Map<String, Identity>> oldIdentities = Collections.emptyMap();
while (!shouldStop()) {
Map<OwnIdentity, Map<String, Identity>> currentIdentities = new HashMap<OwnIdentity, Map<String, Identity>>();
+ @SuppressWarnings("hiding")
Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
Set<OwnIdentity> ownIdentities = null;
Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
Set<OwnIdentity> ownIdentities = null;
diff --git
a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
index
59da039
..
b4ea53d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/
src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@
-77,6
+77,7
@@
public class WebOfTrustConnector implements ConnectorListener {
* if the own identities can not be loaded
*/
public Set<OwnIdentity> loadAllOwnIdentities() throws WebOfTrustException {
* if the own identities can not be loaded
*/
public Set<OwnIdentity> loadAllOwnIdentities() throws WebOfTrustException {
+ @SuppressWarnings("hiding")
Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get());
SimpleFieldSet fields = reply.getFields();
int ownIdentityCounter = -1;
Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get());
SimpleFieldSet fields = reply.getFields();
int ownIdentityCounter = -1;
@@
-124,6
+125,7
@@
public class WebOfTrustConnector implements ConnectorListener {
* if an error occured talking to the Web of Trust plugin
*/
public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity, String context) throws PluginException {
* if an error occured talking to the Web of Trust plugin
*/
public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity, String context) throws PluginException {
+ @SuppressWarnings("hiding")
Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("TreeOwner", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).get());
SimpleFieldSet fields = reply.getFields();
Set<Identity> identities = new HashSet<Identity>();
Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("TreeOwner", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).get());
SimpleFieldSet fields = reply.getFields();
Set<Identity> identities = new HashSet<Identity>();
@@
-183,6
+185,7
@@
public class WebOfTrustConnector implements ConnectorListener {
* if an error occured talking to the Web of Trust plugin
*/
public String getProperty(Identity identity, String name) throws PluginException {
* if an error occured talking to the Web of Trust plugin
*/
public String getProperty(Identity identity, String name) throws PluginException {
+ @SuppressWarnings("hiding")
Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get());
return reply.getFields().get("Property");
}
Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get());
return reply.getFields().get("Property");
}
@@
-396,7
+399,7
@@
public class WebOfTrustConnector implements ConnectorListener {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public void receivedReply(PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) {
+ public void receivedReply(
@SuppressWarnings("hiding")
PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) {
String messageName = fields.get("Message");
logger.log(Level.FINEST, "Received Reply from Plugin: " + messageName);
synchronized (reply) {
String messageName = fields.get("Message");
logger.log(Level.FINEST, "Received Reply from Plugin: " + messageName);
synchronized (reply) {
diff --git
a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index
d642dd8
..
91fb547
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@
-145,7
+145,7
@@
public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public void runPlugin(PluginRespirator pluginRespirator) {
+ public void runPlugin(
@SuppressWarnings("hiding")
PluginRespirator pluginRespirator) {
this.pluginRespirator = pluginRespirator;
/* create a configuration. */
this.pluginRespirator = pluginRespirator;
/* create a configuration. */
diff --git
a/src/main/java/net/pterodactylus/sone/text/PartContainer.java
b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
index
384e8ae
..
88c889e
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/text/PartContainer.java
+++ b/
src/main/java/net/pterodactylus/sone/text/PartContainer.java
@@
-107,6
+107,7
@@
public class PartContainer implements Part, Iterable<Part> {
}
noNextPart = true;
while (!partStack.isEmpty()) {
}
noNextPart = true;
while (!partStack.isEmpty()) {
+ @SuppressWarnings("hiding")
Iterator<Part> parts = partStack.pop();
if (parts.hasNext()) {
nextPart = parts.next();
Iterator<Part> parts = partStack.pop();
if (parts.hasNext()) {
nextPart = parts.next();
diff --git
a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index
91e2a08
..
42f0a82
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@
-457,6
+457,7
@@
public class SearchPage extends SoneTemplatePage {
if (!(object instanceof Phrase)) {
return false;
}
if (!(object instanceof Phrase)) {
return false;
}
+ @SuppressWarnings("hiding")
Phrase phrase = (Phrase) object;
return (this.optionality == phrase.optionality) && this.phrase.equals(phrase.phrase);
}
Phrase phrase = (Phrase) object;
return (this.optionality == phrase.optionality) && this.phrase.equals(phrase.phrase);
}