[Cherbot-commit] SF.net SVN: cherbot: [33] trunk/src/net/sf/cherbot
Status: Alpha
Brought to you by:
christianhujer
Menu
▾
▴
[Cherbot-commit] SF.net SVN: cherbot: [33] trunk/src/net/sf/cherbot
|
From: <chr...@us...> - 2006-10-29 14:10:47
|
Revision: 33
http://svn.sourceforge.net/cherbot/?rev=33&view=rev
Author: christianhujer
Date: 2006-10-29 06:10:21 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
Declared foreach loop variables final.
Modified Paths:
--------------
trunk/src/net/sf/cherbot/CherBot.java
trunk/src/net/sf/cherbot/CherBotSecurityManager.java
trunk/src/net/sf/cherbot/CollectionsManager.java
trunk/src/net/sf/cherbot/CrimeManager.java
trunk/src/net/sf/cherbot/DeathsManager.java
trunk/src/net/sf/cherbot/EmotesManager.java
trunk/src/net/sf/cherbot/ExampleTester.java
trunk/src/net/sf/cherbot/GreetingsManager.java
trunk/src/net/sf/cherbot/GroupManager.java
trunk/src/net/sf/cherbot/MailManager.java
trunk/src/net/sf/cherbot/Manager.java
trunk/src/net/sf/cherbot/ManagerDocumenter.java
trunk/src/net/sf/cherbot/NoobManager.java
trunk/src/net/sf/cherbot/PlayerManager.java
trunk/src/net/sf/cherbot/PollManager.java
trunk/src/net/sf/cherbot/SalesManager.java
Modified: trunk/src/net/sf/cherbot/CherBot.java
===================================================================
--- trunk/src/net/sf/cherbot/CherBot.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/CherBot.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -306,7 +306,7 @@
*/
public void say(final String s) {
final StringBuilder sb = new StringBuilder();
- for (String line : lineSplit(s)) {
+ for (final String line : lineSplit(s)) {
sb.setLength(0);
}
}
@@ -468,7 +468,7 @@
if (username.equals(who)) {
return;
} // avoid lamenting myself
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
manager.died(who, killer, with);
}
}
@@ -584,7 +584,7 @@
@Examples({ "List modules!", "Show modules!" })
@Override public void performImpl() {
final StringBuilder mods = new StringBuilder();
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
if (mods.length() > 0) {
mods.append(", ");
} else {
@@ -604,7 +604,7 @@
@Examples({ "List commands!", "Show commands!" })
@Override public void performImpl() {
final StringBuilder sb = new StringBuilder();
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
if (sb.length() == 0) {
sb.append("Loaded modules: ");
} else {
@@ -622,10 +622,10 @@
@Override public void performImpl() {
final String topic = matcher.group(4);
final StringBuilder sb = new StringBuilder();
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
if (topic.equals(manager.getTopic())) {
sb.append("Commands for module ").append(topic).append('\n');
- for (Command command : manager.commands()) {
+ for (final Command command : manager.commands()) {
sb.append(command.getPattern()).append('\n');
}
answer(sb.toString());
@@ -647,9 +647,9 @@
@Examples({ "Really list all commands!", "Really show me all commands!" })
@Override public void performImpl() {
final StringBuilder sb = new StringBuilder();
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
sb.append(manager.getTopic()).append('\n').append(manager.getTopic().replaceAll(".", "-")).append('\n');
- for (Command command : manager.commands()) {
+ for (final Command command : manager.commands()) {
sb.append(command.getPattern()).append('\n');
}
}
@@ -663,7 +663,7 @@
if (topic.equals("usage")) {
answer("Usage: tell me a command. You may also use shout or say but I will nearly always respond in tell. I don't want to bother other players. Use good, clear, correct, complete English sentences, that will work best. Tell me 'help commands' to find out what I understand.");
} else {
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
if (topic.equalsIgnoreCase(manager.getTopic())) {
manager.help();
}
@@ -737,7 +737,7 @@
*/
@Override public void help() {
final StringBuilder topics = new StringBuilder();
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
if (topics.length() > 0) {
topics.append(", ");
}
@@ -777,7 +777,7 @@
{ // IO Modules
new IOModule() {
@Override public void save() {
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
if (manager != InternalManager.this) {
try {
manager.save();
@@ -790,7 +790,7 @@
}
@Override public void load() {
- for (Manager manager : managers) {
+ for (final Manager manager : managers) {
if (manager != InternalManager.this) {
try {
manager.load();
Modified: trunk/src/net/sf/cherbot/CherBotSecurityManager.java
===================================================================
--- trunk/src/net/sf/cherbot/CherBotSecurityManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/CherBotSecurityManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -120,7 +120,7 @@
@Override public void performImpl() {
final SortedSet<String> players = new TreeSet<String>(nullStringComparator);
players.addAll(permissions.keySet());
- for (String player : players) {
+ for (final String player : players) {
list(player);
}
}
@@ -283,7 +283,7 @@
//PrintWriter out = null;
//try {
// out = new PrintWriter(new OutputStreamWriter(new FileOutputStream("security.txt")));
- // for (String player : permissions.keySet()) {
+ // for (final String player : permissions.keySet()) {
// if (player != null) {
// out.append(player);
// }
Modified: trunk/src/net/sf/cherbot/CollectionsManager.java
===================================================================
--- trunk/src/net/sf/cherbot/CollectionsManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/CollectionsManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -264,7 +264,7 @@
* Notifies all registered listeners of what the entering person collects.
*/
@Override public void entered(final String player) {
- for (String listener : listeners) {
+ for (final String listener : listeners) {
if (!player.equals(listener) && isLoggedIn(listener)) {
tellCollectablesFor(listener, player);
}
@@ -320,7 +320,7 @@
if (!isActor(collector)) {
checkPermission(PERM_COLLECT, "You are not allowed to edit somebody elses collections list.");
}
- for (String collectable : collectables) {
+ for (final String collectable : collectables) {
if (collectable.length() > 0 && collections.add(new Entry(collector, collectable))) {
answer("I now know that " + (collector.equals(getActor()) ? "you collect " : collector + " collects ") + collectable + ".");
} else {
@@ -338,7 +338,7 @@
if (!isActor(collector)) {
checkPermission(PERM_COLLECT, "You are not allowed to edit somebody elses collections list.");
}
- for (String collectable : collectables) {
+ for (final String collectable : collectables) {
if (collections.remove(new Entry(collector, collectable))) {
answer("I now know that " + (collector.equals(getActor()) ? "you don't" : collector + " doesn't") + " collect " + collectable + " anymore.");
} else {
@@ -354,7 +354,7 @@
*/
private void tellCollectablesFor(final String player, final String collector) {
final SortedSet<String> items = new TreeSet<String>();
- for (Entry e : collections) {
+ for (final Entry e : collections) {
if (e.collector.equals(collector)) {
items.add(e.collectable);
}
@@ -376,7 +376,7 @@
*/
private void listCollectablesFor(final String collector) {
final SortedSet<String> items = new TreeSet<String>();
- for (Entry e : collections) {
+ for (final Entry e : collections) {
if (e.collector.equals(collector)) {
items.add(e.collectable);
}
@@ -402,7 +402,7 @@
*/
private void listCollectorsFor(final String collectable) {
final Map<String, SortedSet<String>> col = new HashMap<String, SortedSet<String>>();
- for (Entry e : collections) {
+ for (final Entry e : collections) {
if (e.collectable.contains(collectable) || collectable.contains(e.collectable)) {
if (!col.containsKey(e.collector)) {
col.put(e.collector, new TreeSet<String>());
@@ -416,7 +416,7 @@
sb.append(collectable).append(" is/are collected by: ");
sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
int i = 0;
- for (String collector : new TreeSet<String>(col.keySet())) {
+ for (final String collector : new TreeSet<String>(col.keySet())) {
sb.append(collector).append(" (");
concat(sb, col.get(collector));
sb.append(')');
@@ -440,7 +440,7 @@
*/
private void listOnlineCollectorsFor(final String collectable) {
final Map<String, SortedSet<String>> col = new HashMap<String, SortedSet<String>>();
- for (Entry e : collections) {
+ for (final Entry e : collections) {
if (e.collectable.contains(collectable) || collectable.contains(e.collectable)) {
if (isLoggedIn(e.collector)) {
if (!col.containsKey(e.collector)) {
@@ -456,7 +456,7 @@
sb.append(collectable).append(" is/are collected by: ");
sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
int i = 0;
- for (String collector : new TreeSet<String>(col.keySet())) {
+ for (final String collector : new TreeSet<String>(col.keySet())) {
sb.append(collector).append(" (");
concat(sb, col.get(collector));
sb.append(')');
@@ -479,7 +479,7 @@
*/
private void listCollectors() {
final SortedSet<String> players = new TreeSet<String>();
- for (Entry e : collections) {
+ for (final Entry e : collections) {
players.add(e.collector);
}
if (players.size() > 0) {
@@ -498,7 +498,7 @@
*/
private void listOnlineCollectors() {
final SortedSet<String> players = new TreeSet<String>();
- for (Entry e : collections) {
+ for (final Entry e : collections) {
final String collector = e.collector;
if (isLoggedIn(collector)) {
players.add(collector);
@@ -520,7 +520,7 @@
*/
private void listCollectables() {
final SortedSet<String> items = new TreeSet<String>();
- for (Entry e : collections) {
+ for (final Entry e : collections) {
items.add(e.collectable);
}
if (items.size() > 0) {
@@ -557,7 +557,7 @@
{ // IO Modules
new RegexIOModule("collections.txt", "(.*?): (.*)") {
@Override protected void saveImpl() throws IOException {
- for (Entry collection : collections) {
+ for (final Entry collection : collections) {
println(collection.collector + ": " + collection.collectable);
}
}
Modified: trunk/src/net/sf/cherbot/CrimeManager.java
===================================================================
--- trunk/src/net/sf/cherbot/CrimeManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/CrimeManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -191,7 +191,7 @@
*/
@Override public void entered(final String player) {
final Set<String> cs = new TreeSet<String>();
- for (Crime crime : crimes.keySet()) {
+ for (final Crime crime : crimes.keySet()) {
if (crime.criminal.equals(player)) {
cs.add(crime.crimetype);
}
@@ -210,12 +210,12 @@
*/
private void listCriminals() {
final Set<String> criminals = new TreeSet<String>();
- for (Crime crime : crimes.keySet()) {
+ for (final Crime crime : crimes.keySet()) {
criminals.add(crime.criminal);
}
if (criminals.size() > 0) {
final StringBuilder sb = new StringBuilder();
- for (String criminal : criminals) {
+ for (final String criminal : criminals) {
if (sb.length() > 0) {
sb.append(", ");
}
@@ -233,7 +233,7 @@
*/
private void listCriminalsOnline() {
final Set<String> criminals = new TreeSet<String>();
- for (Crime crime : crimes.keySet()) {
+ for (final Crime crime : crimes.keySet()) {
final String criminal = crime.criminal;
if (isLoggedIn(criminal)) {
criminals.add(criminal);
@@ -241,7 +241,7 @@
}
if (criminals.size() > 0) {
final StringBuilder sb = new StringBuilder();
- for (String criminal : criminals) {
+ for (final String criminal : criminals) {
if (sb.length() > 0) {
sb.append(", ");
}
@@ -259,7 +259,7 @@
*/
private void listCrimes() {
final StringBuilder sb = new StringBuilder();
- for (Crime crime : crimes.keySet()) {
+ for (final Crime crime : crimes.keySet()) {
sb.append(crime.criminal).append(": ").append(crime.crimetype).append(" (reported by ").append(crime.reporter).append(", ").append(crimes.get(crime)[0]).append(" times)\n");
}
answer(sb.toString());
@@ -278,7 +278,7 @@
*/
private void listCrimesOf(final String criminal) {
final Set<Crime> cs = new HashSet<Crime>();
- for (Crime crime : crimes.keySet()) {
+ for (final Crime crime : crimes.keySet()) {
if (crime.criminal.equals(criminal)) {
cs.add(crime);
}
@@ -287,7 +287,7 @@
answer("I don't know of any crimes " + criminal + " could have committed.");
} else {
final StringBuilder sb = new StringBuilder();
- for (Crime crime : cs) {
+ for (final Crime crime : cs) {
if (sb.length() == 0) {
sb.append(criminal).append(" committed ");
} else {
@@ -354,7 +354,7 @@
private void listCrimeTypes() {
final StringBuilder sb = new StringBuilder();
- for (String crimetype : crimeTypes) {
+ for (final String crimetype : crimeTypes) {
if (sb.length() == 0) {
sb.append("The following actions are considered crimes: ");
} else {
@@ -376,7 +376,7 @@
}
@Override protected void saveImpl() throws IOException {
- for (Crime crime : crimes.keySet()) {
+ for (final Crime crime : crimes.keySet()) {
println(crime.criminal + ": " + crime.reporter + ": " + crimes.get(crime)[0] + ": " + crime.crimetype);
}
}
Modified: trunk/src/net/sf/cherbot/DeathsManager.java
===================================================================
--- trunk/src/net/sf/cherbot/DeathsManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/DeathsManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -129,7 +129,7 @@
} else {
int max = 0;
final Set<String> players = new TreeSet<String>();
- for (String player : deaths.keySet()) {
+ for (final String player : deaths.keySet()) {
final int n = deaths.get(player)[0];
if (n > max) {
players.clear();
Modified: trunk/src/net/sf/cherbot/EmotesManager.java
===================================================================
--- trunk/src/net/sf/cherbot/EmotesManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/EmotesManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -220,7 +220,7 @@
*/
public EmotesManager(final CherBot cherBot) {
super(cherBot, "emotes");
- for (String pat : patternTexts) {
+ for (final String pat : patternTexts) {
patterns.add(Pattern.compile(pat));
}
}
@@ -493,7 +493,7 @@
*/
private int countLikes() {
int likes = 0;
- for (String player : attitude.keySet()) {
+ for (final String player : attitude.keySet()) {
if (attitude.get(player)[0] > 0) {
likes++;
}
@@ -507,7 +507,7 @@
*/
private int countDislikes() {
int dislikes = 0;
- for (String player : attitude.keySet()) {
+ for (final String player : attitude.keySet()) {
if (attitude.get(player)[0] < 0) {
dislikes++;
}
Modified: trunk/src/net/sf/cherbot/ExampleTester.java
===================================================================
--- trunk/src/net/sf/cherbot/ExampleTester.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/ExampleTester.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -33,7 +33,7 @@
*/
public static TestSuite createSuite(final CherBot cherbot) {
final TestSuite suite = new ExampleTester();
- for (Manager manager : cherbot.managers()) {
+ for (final Manager manager : cherbot.managers()) {
suite.addTest(createSuite(manager));
}
return suite;
@@ -46,7 +46,7 @@
*/
public static TestSuite createSuite(final Manager manager) {
final TestSuite suite = new TestSuite(manager.getTopic());
- for (Manager.Command command : manager.commands()) {
+ for (final Manager.Command command : manager.commands()) {
suite.addTest(createSuite(command));
}
return suite;
@@ -64,7 +64,7 @@
final Class<? extends Manager.Command> clazz = command.getClass();
final Method method = clazz.getDeclaredMethod("performImpl");
if (method.isAnnotationPresent(Manager.Examples.class)) {
- for (String example : method.getAnnotation(Manager.Examples.class).value()) {
+ for (final String example : method.getAnnotation(Manager.Examples.class).value()) {
suite.addTest(new ExampleTestCase(pattern, example));
}
} else {
Modified: trunk/src/net/sf/cherbot/GreetingsManager.java
===================================================================
--- trunk/src/net/sf/cherbot/GreetingsManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/GreetingsManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -68,7 +68,7 @@
@Examples({ "Show all greetings.", "Tell me all greetings." })
@Override public void performImpl() {
checkPermission(PERM_LIST_GREETINGS);
- for (String player : new TreeSet<String>(greetings.keySet())) {
+ for (final String player : new TreeSet<String>(greetings.keySet())) {
answer(player + ": " + greetings.get(player));
}
}
Modified: trunk/src/net/sf/cherbot/GroupManager.java
===================================================================
--- trunk/src/net/sf/cherbot/GroupManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/GroupManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -708,7 +708,7 @@
throw new SecurityException("This group is invisible and you don't have the required permissions to list this group's allies.");
}
final SortedSet<String> gs = new TreeSet<String>();
- for (Group g : allies) {
+ for (final Group g : allies) {
if (g.allies.contains(this)) {
gs.add(g.name);
}
@@ -819,7 +819,7 @@
final SortedSet<String> ms = new TreeSet<String>(memberRankComparator);
ms.addAll(members.keySet());
State state = null;
- for (String member : ms) {
+ for (final String member : ms) {
final State newState = members.get(member).getState();
if (newState != state) {
state = newState;
@@ -840,14 +840,14 @@
throw new SecurityException("This group is invisible and you don't have the required permissions to list this group's members.");
}
final SortedSet<String> online = new TreeSet<String>(memberRankComparator);
- for (String member : new TreeSet<String>(members.keySet())) {
+ for (final String member : new TreeSet<String>(members.keySet())) {
if (manager.isLoggedIn(member)) {
online.add(member);
}
}
if (online.size() != 0) {
final StringBuilder sb = new StringBuilder("Online members of ").append(name).append(':');
- for (String member : online) {
+ for (final String member : online) {
sb.append('\n').append(members.get(member));
}
manager.answer(sb);
@@ -1378,7 +1378,7 @@
final ObjectInputStream in = new ObjectInputStream(new FileInputStream("groups.dat"));
try {
groups = (Map<String, Group>) in.readObject();
- for (Map.Entry<String, Group> entry : groups.entrySet()) {
+ for (final Map.Entry<String, Group> entry : groups.entrySet()) {
entry.getValue().manager = this;
}
} finally {
Modified: trunk/src/net/sf/cherbot/MailManager.java
===================================================================
--- trunk/src/net/sf/cherbot/MailManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/MailManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -278,7 +278,7 @@
tell(player, "You have mail.");
}
if (player.equals(getCherBot().getUsername())) {
- for (String to : mails.keySet()) {
+ for (final String to : mails.keySet()) {
if (isLoggedIn(to)) {
tell(to, "You have mail. Use \"/tell Cherbot read mail\" to read it.");
}
@@ -296,7 +296,7 @@
if (ms == null) {
return false;
}
- for (Mail mail : ms) {
+ for (final Mail mail : ms) {
if (!mail.read) {
return true;
}
@@ -386,8 +386,8 @@
}
@Override protected void saveImpl() {
- for (String to : mails.keySet()) {
- for (Mail mail : mails.get(to)) {
+ for (final String to : mails.keySet()) {
+ for (final Mail mail : mails.get(to)) {
println(mail.from + ": " + mail.to + ": " + mail.ts + ": " + mail.msg + ": " + mail.read);
}
}
Modified: trunk/src/net/sf/cherbot/Manager.java
===================================================================
--- trunk/src/net/sf/cherbot/Manager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/Manager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -310,7 +310,7 @@
*/
public void load() throws Exception {
Exception ex = null;
- for (IOModule iomodule : iomodules) {
+ for (final IOModule iomodule : iomodules) {
try {
iomodule.load();
} catch (final Exception e) {
@@ -331,7 +331,7 @@
*/
public void save() throws Exception {
Exception ex = null;
- for (IOModule iomodule : iomodules) {
+ for (final IOModule iomodule : iomodules) {
try {
iomodule.save();
} catch (final Exception e) {
@@ -1281,7 +1281,7 @@
* {@inheritDoc}
*/
@Override protected final void saveImpl() {
- for (String key : map.keySet()) {
+ for (final String key : map.keySet()) {
println(key + ": " + conv.toString(map.get(key)));
}
}
Modified: trunk/src/net/sf/cherbot/ManagerDocumenter.java
===================================================================
--- trunk/src/net/sf/cherbot/ManagerDocumenter.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/ManagerDocumenter.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -43,7 +43,7 @@
doc = db.newDocument();
final Element root = doc.createElement("managers");
doc.appendChild(root);
- for (Manager manager : bot.managers()) {
+ for (final Manager manager : bot.managers()) {
root.appendChild(createElement(manager));
}
ls.createLSSerializer().writeToURI(doc, args[0]);
@@ -64,13 +64,13 @@
System.err.println("No description on " + clazz);
}
if (clazz.isAnnotationPresent(Manager.Features.class)) {
- for (String feature : clazz.getAnnotation(Manager.Features.class).value()) {
+ for (final String feature : clazz.getAnnotation(Manager.Features.class).value()) {
ret.appendChild(createTextElement("feature", feature));
}
} else {
System.err.println("No feature list on " + clazz);
}
- for (Manager.Command command : manager.commands()) {
+ for (final Manager.Command command : manager.commands()) {
ret.appendChild(createElement(command));
}
return ret;
@@ -93,7 +93,7 @@
System.err.println("No description on " + method);
}
if (method.isAnnotationPresent(Manager.Examples.class)) {
- for (String example : method.getAnnotation(Manager.Examples.class).value()) {
+ for (final String example : method.getAnnotation(Manager.Examples.class).value()) {
ret.appendChild(createTextElement("example", example));
}
} else {
Modified: trunk/src/net/sf/cherbot/NoobManager.java
===================================================================
--- trunk/src/net/sf/cherbot/NoobManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/NoobManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -149,7 +149,7 @@
*/
private void listHowtos() {
final StringBuilder sb = new StringBuilder();
- for (Pattern howto : howtos.keySet()) {
+ for (final Pattern howto : howtos.keySet()) {
if (sb.length() == 0) {
sb.append("I know the following howtos:\n");
} else {
@@ -166,7 +166,7 @@
*/
private void listWhatiss() {
final StringBuilder sb = new StringBuilder();
- for (Pattern whatis : whatiss.keySet()) {
+ for (final Pattern whatis : whatiss.keySet()) {
if (sb.length() == 0) {
sb.append("I know the following whatis:\n");
} else {
@@ -183,7 +183,7 @@
*/
private void listWhereiss() {
final StringBuilder sb = new StringBuilder();
- for (Pattern whereis : whereiss.keySet()) {
+ for (final Pattern whereis : whereiss.keySet()) {
if (sb.length() == 0) {
sb.append("I know the following whereis:\n");
} else {
@@ -200,7 +200,7 @@
* @param topic topic to get howto on
*/
private void getHowto(final String topic) {
- for (Pattern pattern : howtos.keySet()) {
+ for (final Pattern pattern : howtos.keySet()) {
if (pattern.matcher(topic).matches()) {
answer(howtos.get(pattern));
return;
@@ -214,7 +214,7 @@
* @param topic topic to get whereis on
*/
private void getWhereis(final String topic) {
- for (Pattern pattern : whereiss.keySet()) {
+ for (final Pattern pattern : whereiss.keySet()) {
if (pattern.matcher(topic).matches()) {
answer(whereiss.get(pattern));
return;
@@ -237,7 +237,7 @@
* @param topic topic to get whatis on
*/
private void getWhatis(final String topic) {
- for (Pattern pattern : whatiss.keySet()) {
+ for (final Pattern pattern : whatiss.keySet()) {
if (pattern.matcher(topic).matches()) {
answer(whatiss.get(pattern));
return;
@@ -271,7 +271,7 @@
}
@Override protected void saveImpl() {
- for (Pattern topic : howtos.keySet()) {
+ for (final Pattern topic : howtos.keySet()) {
println(topic.pattern() + ": " + howtos.get(topic));
}
}
@@ -285,7 +285,7 @@
}
@Override protected void saveImpl() {
- for (Pattern topic : whereiss.keySet()) {
+ for (final Pattern topic : whereiss.keySet()) {
println(topic.pattern() + ": " + whereiss.get(topic));
}
}
@@ -299,7 +299,7 @@
}
@Override protected void saveImpl() {
- for (Pattern topic : whatiss.keySet()) {
+ for (final Pattern topic : whatiss.keySet()) {
println(topic.pattern() + ": " + whatiss.get(topic));
}
}
Modified: trunk/src/net/sf/cherbot/PlayerManager.java
===================================================================
--- trunk/src/net/sf/cherbot/PlayerManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/PlayerManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -257,7 +257,7 @@
@Examples({ "Show me all gratulations.", "List all gratulations." })
@Override public void performImpl() {
checkPermission(PERM_LIST_GRATULATION);
- for (String player : new TreeSet<String>(gratulations.keySet())) {
+ for (final String player : new TreeSet<String>(gratulations.keySet())) {
answer(player + ": " + gratulations.get(player));
}
}
@@ -508,13 +508,13 @@
try {
final int level = new TreeSet<Integer>(levels.values()).last(); // get highest level
final SortedSet<String> highestPlayers = new TreeSet<String>();
- for (Map.Entry<String, Integer> entry : levels.entrySet()) {
+ for (final Map.Entry<String, Integer> entry : levels.entrySet()) {
if (entry.getValue() == level) {
highestPlayers.add(entry.getKey());
}
}
final StringBuilder sb = new StringBuilder();
- for (String player : highestPlayers) {
+ for (final String player : highestPlayers) {
if (sb.length() > 0) {
sb.append(", ");
}
@@ -697,7 +697,7 @@
}
playerAliases.add(alias);
}
- for (String name : new TreeSet<String>(reverseMap.keySet())) {
+ for (final String name : new TreeSet<String>(reverseMap.keySet())) {
sb.append('\n').append(name).append(": ");
concat(sb, reverseMap.get(name));
}
@@ -710,7 +710,7 @@
private void listPlayers() {
checkPermission(PERM_LIST_PLAYERS);
final StringBuilder sb = new StringBuilder();
- for (String player : new TreeSet<String>(players)) {
+ for (final String player : new TreeSet<String>(players)) {
sb
.append(sb.length() == 0 ? "I know the following players: " : ", ")
.append(player);
@@ -759,7 +759,7 @@
int end = wantedEnd;
final List<String> pl = new ArrayList<String>();
final List<String> pl2 = new ArrayList<String>();
- for (String player : players) {
+ for (final String player : players) {
if (levels.get(player) > lvl) {
pl.add(player);
}
Modified: trunk/src/net/sf/cherbot/PollManager.java
===================================================================
--- trunk/src/net/sf/cherbot/PollManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/PollManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -167,7 +167,7 @@
*/
private Poll getPoll(final int n) {
// TODO: implement a binary search for the poll
- for (Poll poll : polls) {
+ for (final Poll poll : polls) {
if (poll.getNumber() == n) {
return poll;
}
@@ -203,7 +203,7 @@
*/
private void listPolls(final PollState state, final String nopoll) {
final StringBuilder sb = new StringBuilder();
- for (Poll poll : polls) {
+ for (final Poll poll : polls) {
if (poll.getState() == state) {
sb.append(poll.getNumber()).append(": ").append(poll.getTitle()).append(" (").append(poll.getPlayer()).append(")\n");
}
@@ -226,7 +226,7 @@
.append(p.getTitle()).append('\n')
.append(p.getDescription()).append('\n');
int i = 0;
- for (String choice : p.getChoices()) {
+ for (final String choice : p.getChoices()) {
sb.append(++i).append(": ").append(choice);
if (p.getState() != PollState.PREPARATION) {
sb.append(" (").append(p.getVotes(choice)).append(" votes)");
@@ -653,7 +653,7 @@
out.print(" ");
}
out.println();
- for (String choice : choices) {
+ for (final String choice : choices) {
out.println(choice + ": " + votes.get(choice)[0]);
}
}
Modified: trunk/src/net/sf/cherbot/SalesManager.java
===================================================================
--- trunk/src/net/sf/cherbot/SalesManager.java 2006-10-29 14:02:55 UTC (rev 32)
+++ trunk/src/net/sf/cherbot/SalesManager.java 2006-10-29 14:10:21 UTC (rev 33)
@@ -162,7 +162,7 @@
if (!isActor(seller)) {
checkPermission(PERM_SELL);
}
- for (String ware : split(wares)) {
+ for (final String ware : split(wares)) {
if (sales.remove(new Entry(seller, ware))) {
answer("I now know that " + seller + " doesn't sell " + ware + " anymore.");
} else {
@@ -180,7 +180,7 @@
if (!isActor(seller)) {
checkPermission(PERM_SELL);
}
- for (String ware : split(wares)) {
+ for (final String ware : split(wares)) {
if (ware.length() > 0 && sales.add(new Entry(seller, ware))) {
answer("I now know that " + seller + " sells " + ware + '.');
} else {
@@ -195,7 +195,7 @@
*/
private void listWares(final String seller) {
final Set<String> wares = new TreeSet<String>();
- for (Entry sale : sales) {
+ for (final Entry sale : sales) {
if (sale.seller.equals(seller)) {
wares.add(sale.ware);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
