diff --git a/src/commands/CommandBoop.java b/src/commands/CommandBoop.java index 5ab3ef2..fc0da25 100644 --- a/src/commands/CommandBoop.java +++ b/src/commands/CommandBoop.java @@ -22,7 +22,7 @@ public class CommandBoop extends Command public void ApplyBoop() { ++boops; - MarkDirty(); + markDirty(); } public int HowMany() @@ -31,10 +31,10 @@ public class CommandBoop extends Command } @Override - public String Serialize() { return "" + boops; } + public String serialize() { return "" + boops; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { try { @@ -44,7 +44,7 @@ public class CommandBoop extends Command { GlobalLog.Warn(LogFilter.Command, "No valid value was found for boops! Starting over at 0!"); boops = 0; - MarkDirty(); + markDirty(); } } } diff --git a/src/commands/CommandChangeIndicator.java b/src/commands/CommandChangeIndicator.java index 415f5df..f4133bf 100644 --- a/src/commands/CommandChangeIndicator.java +++ b/src/commands/CommandChangeIndicator.java @@ -28,7 +28,7 @@ public class CommandChangeIndicator extends Command return; } - guild.SetCommandIndicator(indicator); - res.send(String.format(LocStrings.stub("ChangeIndicatorChanged"), guild.GetCommandIndicator())); + guild.setCommandIndicator(indicator); + res.send(String.format(LocStrings.stub("ChangeIndicatorChanged"), guild.getCommandIndicator())); } } diff --git a/src/core/DatabaseManager.java b/src/core/DatabaseManager.java index 4649e7f..e647cbb 100644 --- a/src/core/DatabaseManager.java +++ b/src/core/DatabaseManager.java @@ -94,10 +94,10 @@ public class DatabaseManager { DatabaseTrackedObject dto = globalDataTrackedObjects.get(i); - if(dto.IsDirty()) + if(dto.isDirty()) { - globalSetRemoteValue(dto.identifier, dto.Serialize()); - dto.Resolve(); + globalSetRemoteValue(dto.identifier, dto.serialize()); + dto.resolve(); ++numUpdated; } } @@ -117,10 +117,10 @@ public class DatabaseManager { DatabaseTrackedObject dto = characterDataTrackedObjects.get(i); - if(dto.IsDirty()) + if(dto.isDirty()) { - characterSetRemoteValue(dto.identifier, dto.Serialize()); - dto.Resolve(); + characterSetRemoteValue(dto.identifier, dto.serialize()); + dto.resolve(); ++numUpdated; } } @@ -142,7 +142,7 @@ public class DatabaseManager synchronized(globalDataTrackedObjects) { globalDataTrackedObjects.add(tracked); - tracked.DeSerialzie(globalGetRemoteValue(tracked.identifier)); + tracked.deSerialzie(globalGetRemoteValue(tracked.identifier)); } } @@ -172,7 +172,7 @@ public class DatabaseManager synchronized(characterDataTrackedObjects) { characterDataTrackedObjects.add(tracked); - tracked.DeSerialzie(characterGetRemoteValue(tracked.identifier)); + tracked.deSerialzie(characterGetRemoteValue(tracked.identifier)); } } diff --git a/src/core/DatabaseTrackedObject.java b/src/core/DatabaseTrackedObject.java index 2edfc91..f254e1d 100644 --- a/src/core/DatabaseTrackedObject.java +++ b/src/core/DatabaseTrackedObject.java @@ -13,7 +13,7 @@ public abstract class DatabaseTrackedObject this.identifier = identifier; } - public final boolean IsDirty() + public final boolean isDirty() { synchronized(isDirty) { @@ -21,7 +21,7 @@ public abstract class DatabaseTrackedObject } } - public final void MarkDirty() + public final void markDirty() { synchronized(isDirty) { @@ -29,7 +29,7 @@ public abstract class DatabaseTrackedObject } } - public final void Resolve() + public final void resolve() { synchronized(isDirty) { @@ -39,6 +39,6 @@ public abstract class DatabaseTrackedObject // Consider an object factory instead of dedicated serialization methods // if this starts to become impractical. For now, it works. - public abstract String Serialize(); - public abstract void DeSerialzie(String string); + public abstract String serialize(); + public abstract void deSerialzie(String string); } diff --git a/src/dataStructures/KittyGuild.java b/src/dataStructures/KittyGuild.java index b2d6868..cdbb78e 100644 --- a/src/dataStructures/KittyGuild.java +++ b/src/dataStructures/KittyGuild.java @@ -33,7 +33,7 @@ public class KittyGuild extends DatabaseTrackedObject private String commandIndicator; - private void RegisterTrackedObjects() + private void registerTrackedObjects() { DatabaseManager.instance.globalRegister(roleList); DatabaseManager.instance.globalRegister(beans); @@ -46,13 +46,13 @@ public class KittyGuild extends DatabaseTrackedObject this.uniqueID = uniqueID; roleList = new KittyTrackedVector(roleListName, uniqueID); beans = new KittyTrackedLong(beansName, uniqueID); - RegisterTrackedObjects(); + registerTrackedObjects(); control = adminControl; this.contentRating = KittyRating.Safe; this.polling = false; this.emoji = emoji; - SetCommandIndicator("!"); + setCommandIndicator("!"); } // Explicit constructor @@ -62,9 +62,9 @@ public class KittyGuild extends DatabaseTrackedObject this.uniqueID = uniqueID; roleList = new KittyTrackedVector(roleListName, uniqueID); beans = new KittyTrackedLong(beansName, uniqueID); - RegisterTrackedObjects(); + registerTrackedObjects(); - SetCommandIndicator(commandIndicator); + setCommandIndicator(commandIndicator); this.contentRating = contentRating; this.polling = false; this.guildOwner = guildOwner; @@ -141,31 +141,31 @@ public class KittyGuild extends DatabaseTrackedObject } @Override - public String Serialize() + public String serialize() { return commandIndicator; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string == null || string.length() == 0) - SetCommandIndicator("!"); + setCommandIndicator("!"); else - SetCommandIndicator(string); + setCommandIndicator(string); } - public String GetCommandIndicator() + public String getCommandIndicator() { return commandIndicator; } - public void SetCommandIndicator(String newIndicator) + public void setCommandIndicator(String newIndicator) { if(newIndicator != commandIndicator) { commandIndicator = newIndicator; - MarkDirty(); + markDirty(); } } } diff --git a/src/dataStructures/KittyTrackedLong.java b/src/dataStructures/KittyTrackedLong.java index b584e4b..b61b771 100644 --- a/src/dataStructures/KittyTrackedLong.java +++ b/src/dataStructures/KittyTrackedLong.java @@ -30,14 +30,14 @@ public class KittyTrackedLong extends DatabaseTrackedObject public long Add(long toAdd) { tracked += toAdd; - MarkDirty(); + markDirty(); return tracked; } public long Subtract(long toSubtract) { tracked -= toSubtract; - MarkDirty(); + markDirty(); return tracked; } @@ -49,18 +49,18 @@ public class KittyTrackedLong extends DatabaseTrackedObject public long Set(long newValue) { tracked = newValue; - MarkDirty(); + markDirty(); return tracked; } @Override - public String Serialize() + public String serialize() { return "" + tracked; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string != null) { diff --git a/src/dataStructures/KittyTrackedString.java b/src/dataStructures/KittyTrackedString.java index f7c94bd..5bb959c 100644 --- a/src/dataStructures/KittyTrackedString.java +++ b/src/dataStructures/KittyTrackedString.java @@ -21,7 +21,7 @@ public class KittyTrackedString extends DatabaseTrackedObject synchronized(trackedString) { trackedString = newValue; - MarkDirty(); + markDirty(); } } @@ -35,13 +35,13 @@ public class KittyTrackedString extends DatabaseTrackedObject } @Override - public String Serialize() + public String serialize() { return trackedString; } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string != null && !string.isEmpty()) { @@ -51,7 +51,7 @@ public class KittyTrackedString extends DatabaseTrackedObject { GlobalLog.Log(LogFilter.Database, "String had null or empty value with identifier: " + identifier); string = ""; - MarkDirty(); + markDirty(); } } diff --git a/src/dataStructures/KittyTrackedVector.java b/src/dataStructures/KittyTrackedVector.java index 5bff03f..7484f64 100644 --- a/src/dataStructures/KittyTrackedVector.java +++ b/src/dataStructures/KittyTrackedVector.java @@ -44,7 +44,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject public void add(String str) { trackedVector.add(str); - this.MarkDirty(); + this.markDirty(); } public boolean isEmpty() @@ -65,12 +65,12 @@ public class KittyTrackedVector extends DatabaseTrackedObject public void remove(String str) { trackedVector.remove(str); - this.MarkDirty(); + this.markDirty(); } // Writes out the roles as a single string that can be parsed back in later @Override - public String Serialize() + public String serialize() { String toSerialize = ""; @@ -87,7 +87,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject // Reads in the roles as a delimited single string that needs parsing @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { if(string != null) { diff --git a/src/dataStructures/KittyUser.java b/src/dataStructures/KittyUser.java index 538c818..e8ba0fb 100644 --- a/src/dataStructures/KittyUser.java +++ b/src/dataStructures/KittyUser.java @@ -36,7 +36,7 @@ public class KittyUser extends DatabaseTrackedObject beans += amount; if(amount != 0) - MarkDirty(); + markDirty(); } public void ChangeRole(KittyRole newRole) @@ -44,7 +44,7 @@ public class KittyUser extends DatabaseTrackedObject if(newRole != role) { role = newRole; - MarkDirty(); + markDirty(); } } @@ -59,7 +59,7 @@ public class KittyUser extends DatabaseTrackedObject } @Override - public String Serialize() + public String serialize() { return beans + "," + role.getValue(); } @@ -80,7 +80,7 @@ public class KittyUser extends DatabaseTrackedObject } @Override - public void DeSerialzie(String string) + public void deSerialzie(String string) { try { @@ -91,7 +91,7 @@ public class KittyUser extends DatabaseTrackedObject // Mark ourselves dirty to re-write the role information stored in the user. // Just uses defaults from earlier again. - MarkDirty(); + markDirty(); } else { @@ -107,7 +107,7 @@ public class KittyUser extends DatabaseTrackedObject // We don't need to specify the role at this point because it is set at this point. // We use what the user was created with whatever defaults were in the factory. // Beans are maintained too, just in case there's some in cache. - MarkDirty(); + markDirty(); } } } diff --git a/src/dataStructures/UserInput.java b/src/dataStructures/UserInput.java index 063c6a6..d820006 100644 --- a/src/dataStructures/UserInput.java +++ b/src/dataStructures/UserInput.java @@ -38,7 +38,7 @@ public class UserInput mentions = FindMentionedUsers(event); toParse = toParse.trim(); - String commandIndicator = guildContext.GetCommandIndicator(); + String commandIndicator = guildContext.getCommandIndicator(); if(toParse.startsWith(commandIndicator)) { int loc = FindFirstWhitespace(toParse);