= Database tracked object formatting change
This commit is contained in:
@@ -22,7 +22,7 @@ public class CommandBoop extends Command
|
|||||||
public void ApplyBoop()
|
public void ApplyBoop()
|
||||||
{
|
{
|
||||||
++boops;
|
++boops;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int HowMany()
|
public int HowMany()
|
||||||
@@ -31,10 +31,10 @@ public class CommandBoop extends Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String Serialize() { return "" + boops; }
|
public String serialize() { return "" + boops; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void DeSerialzie(String string)
|
public void deSerialzie(String string)
|
||||||
{
|
{
|
||||||
try
|
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!");
|
GlobalLog.Warn(LogFilter.Command, "No valid value was found for boops! Starting over at 0!");
|
||||||
boops = 0;
|
boops = 0;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class CommandChangeIndicator extends Command
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
guild.SetCommandIndicator(indicator);
|
guild.setCommandIndicator(indicator);
|
||||||
res.send(String.format(LocStrings.stub("ChangeIndicatorChanged"), guild.GetCommandIndicator()));
|
res.send(String.format(LocStrings.stub("ChangeIndicatorChanged"), guild.getCommandIndicator()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,10 +94,10 @@ public class DatabaseManager
|
|||||||
{
|
{
|
||||||
DatabaseTrackedObject dto = globalDataTrackedObjects.get(i);
|
DatabaseTrackedObject dto = globalDataTrackedObjects.get(i);
|
||||||
|
|
||||||
if(dto.IsDirty())
|
if(dto.isDirty())
|
||||||
{
|
{
|
||||||
globalSetRemoteValue(dto.identifier, dto.Serialize());
|
globalSetRemoteValue(dto.identifier, dto.serialize());
|
||||||
dto.Resolve();
|
dto.resolve();
|
||||||
++numUpdated;
|
++numUpdated;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -117,10 +117,10 @@ public class DatabaseManager
|
|||||||
{
|
{
|
||||||
DatabaseTrackedObject dto = characterDataTrackedObjects.get(i);
|
DatabaseTrackedObject dto = characterDataTrackedObjects.get(i);
|
||||||
|
|
||||||
if(dto.IsDirty())
|
if(dto.isDirty())
|
||||||
{
|
{
|
||||||
characterSetRemoteValue(dto.identifier, dto.Serialize());
|
characterSetRemoteValue(dto.identifier, dto.serialize());
|
||||||
dto.Resolve();
|
dto.resolve();
|
||||||
++numUpdated;
|
++numUpdated;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -142,7 +142,7 @@ public class DatabaseManager
|
|||||||
synchronized(globalDataTrackedObjects)
|
synchronized(globalDataTrackedObjects)
|
||||||
{
|
{
|
||||||
globalDataTrackedObjects.add(tracked);
|
globalDataTrackedObjects.add(tracked);
|
||||||
tracked.DeSerialzie(globalGetRemoteValue(tracked.identifier));
|
tracked.deSerialzie(globalGetRemoteValue(tracked.identifier));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,7 +172,7 @@ public class DatabaseManager
|
|||||||
synchronized(characterDataTrackedObjects)
|
synchronized(characterDataTrackedObjects)
|
||||||
{
|
{
|
||||||
characterDataTrackedObjects.add(tracked);
|
characterDataTrackedObjects.add(tracked);
|
||||||
tracked.DeSerialzie(characterGetRemoteValue(tracked.identifier));
|
tracked.deSerialzie(characterGetRemoteValue(tracked.identifier));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ public abstract class DatabaseTrackedObject
|
|||||||
this.identifier = identifier;
|
this.identifier = identifier;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final boolean IsDirty()
|
public final boolean isDirty()
|
||||||
{
|
{
|
||||||
synchronized(isDirty)
|
synchronized(isDirty)
|
||||||
{
|
{
|
||||||
@@ -21,7 +21,7 @@ public abstract class DatabaseTrackedObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void MarkDirty()
|
public final void markDirty()
|
||||||
{
|
{
|
||||||
synchronized(isDirty)
|
synchronized(isDirty)
|
||||||
{
|
{
|
||||||
@@ -29,7 +29,7 @@ public abstract class DatabaseTrackedObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void Resolve()
|
public final void resolve()
|
||||||
{
|
{
|
||||||
synchronized(isDirty)
|
synchronized(isDirty)
|
||||||
{
|
{
|
||||||
@@ -39,6 +39,6 @@ public abstract class DatabaseTrackedObject
|
|||||||
|
|
||||||
// Consider an object factory instead of dedicated serialization methods
|
// Consider an object factory instead of dedicated serialization methods
|
||||||
// if this starts to become impractical. For now, it works.
|
// if this starts to become impractical. For now, it works.
|
||||||
public abstract String Serialize();
|
public abstract String serialize();
|
||||||
public abstract void DeSerialzie(String string);
|
public abstract void deSerialzie(String string);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public class KittyGuild extends DatabaseTrackedObject
|
|||||||
|
|
||||||
private String commandIndicator;
|
private String commandIndicator;
|
||||||
|
|
||||||
private void RegisterTrackedObjects()
|
private void registerTrackedObjects()
|
||||||
{
|
{
|
||||||
DatabaseManager.instance.globalRegister(roleList);
|
DatabaseManager.instance.globalRegister(roleList);
|
||||||
DatabaseManager.instance.globalRegister(beans);
|
DatabaseManager.instance.globalRegister(beans);
|
||||||
@@ -46,13 +46,13 @@ public class KittyGuild extends DatabaseTrackedObject
|
|||||||
this.uniqueID = uniqueID;
|
this.uniqueID = uniqueID;
|
||||||
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
||||||
beans = new KittyTrackedLong(beansName, uniqueID);
|
beans = new KittyTrackedLong(beansName, uniqueID);
|
||||||
RegisterTrackedObjects();
|
registerTrackedObjects();
|
||||||
|
|
||||||
control = adminControl;
|
control = adminControl;
|
||||||
this.contentRating = KittyRating.Safe;
|
this.contentRating = KittyRating.Safe;
|
||||||
this.polling = false;
|
this.polling = false;
|
||||||
this.emoji = emoji;
|
this.emoji = emoji;
|
||||||
SetCommandIndicator("!");
|
setCommandIndicator("!");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Explicit constructor
|
// Explicit constructor
|
||||||
@@ -62,9 +62,9 @@ public class KittyGuild extends DatabaseTrackedObject
|
|||||||
this.uniqueID = uniqueID;
|
this.uniqueID = uniqueID;
|
||||||
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
roleList = new KittyTrackedVector(roleListName, uniqueID);
|
||||||
beans = new KittyTrackedLong(beansName, uniqueID);
|
beans = new KittyTrackedLong(beansName, uniqueID);
|
||||||
RegisterTrackedObjects();
|
registerTrackedObjects();
|
||||||
|
|
||||||
SetCommandIndicator(commandIndicator);
|
setCommandIndicator(commandIndicator);
|
||||||
this.contentRating = contentRating;
|
this.contentRating = contentRating;
|
||||||
this.polling = false;
|
this.polling = false;
|
||||||
this.guildOwner = guildOwner;
|
this.guildOwner = guildOwner;
|
||||||
@@ -141,31 +141,31 @@ public class KittyGuild extends DatabaseTrackedObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String Serialize()
|
public String serialize()
|
||||||
{
|
{
|
||||||
return commandIndicator;
|
return commandIndicator;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void DeSerialzie(String string)
|
public void deSerialzie(String string)
|
||||||
{
|
{
|
||||||
if(string == null || string.length() == 0)
|
if(string == null || string.length() == 0)
|
||||||
SetCommandIndicator("!");
|
setCommandIndicator("!");
|
||||||
else
|
else
|
||||||
SetCommandIndicator(string);
|
setCommandIndicator(string);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String GetCommandIndicator()
|
public String getCommandIndicator()
|
||||||
{
|
{
|
||||||
return commandIndicator;
|
return commandIndicator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetCommandIndicator(String newIndicator)
|
public void setCommandIndicator(String newIndicator)
|
||||||
{
|
{
|
||||||
if(newIndicator != commandIndicator)
|
if(newIndicator != commandIndicator)
|
||||||
{
|
{
|
||||||
commandIndicator = newIndicator;
|
commandIndicator = newIndicator;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,14 +30,14 @@ public class KittyTrackedLong extends DatabaseTrackedObject
|
|||||||
public long Add(long toAdd)
|
public long Add(long toAdd)
|
||||||
{
|
{
|
||||||
tracked += toAdd;
|
tracked += toAdd;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
return tracked;
|
return tracked;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long Subtract(long toSubtract)
|
public long Subtract(long toSubtract)
|
||||||
{
|
{
|
||||||
tracked -= toSubtract;
|
tracked -= toSubtract;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
return tracked;
|
return tracked;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,18 +49,18 @@ public class KittyTrackedLong extends DatabaseTrackedObject
|
|||||||
public long Set(long newValue)
|
public long Set(long newValue)
|
||||||
{
|
{
|
||||||
tracked = newValue;
|
tracked = newValue;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
return tracked;
|
return tracked;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String Serialize()
|
public String serialize()
|
||||||
{
|
{
|
||||||
return "" + tracked;
|
return "" + tracked;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void DeSerialzie(String string)
|
public void deSerialzie(String string)
|
||||||
{
|
{
|
||||||
if(string != null)
|
if(string != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ public class KittyTrackedString extends DatabaseTrackedObject
|
|||||||
synchronized(trackedString)
|
synchronized(trackedString)
|
||||||
{
|
{
|
||||||
trackedString = newValue;
|
trackedString = newValue;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,13 +35,13 @@ public class KittyTrackedString extends DatabaseTrackedObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String Serialize()
|
public String serialize()
|
||||||
{
|
{
|
||||||
return trackedString;
|
return trackedString;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void DeSerialzie(String string)
|
public void deSerialzie(String string)
|
||||||
{
|
{
|
||||||
if(string != null && !string.isEmpty())
|
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);
|
GlobalLog.Log(LogFilter.Database, "String had null or empty value with identifier: " + identifier);
|
||||||
string = "";
|
string = "";
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject
|
|||||||
public void add(String str)
|
public void add(String str)
|
||||||
{
|
{
|
||||||
trackedVector.add(str);
|
trackedVector.add(str);
|
||||||
this.MarkDirty();
|
this.markDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEmpty()
|
public boolean isEmpty()
|
||||||
@@ -65,12 +65,12 @@ public class KittyTrackedVector extends DatabaseTrackedObject
|
|||||||
public void remove(String str)
|
public void remove(String str)
|
||||||
{
|
{
|
||||||
trackedVector.remove(str);
|
trackedVector.remove(str);
|
||||||
this.MarkDirty();
|
this.markDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Writes out the roles as a single string that can be parsed back in later
|
// Writes out the roles as a single string that can be parsed back in later
|
||||||
@Override
|
@Override
|
||||||
public String Serialize()
|
public String serialize()
|
||||||
{
|
{
|
||||||
String toSerialize = "";
|
String toSerialize = "";
|
||||||
|
|
||||||
@@ -87,7 +87,7 @@ public class KittyTrackedVector extends DatabaseTrackedObject
|
|||||||
|
|
||||||
// Reads in the roles as a delimited single string that needs parsing
|
// Reads in the roles as a delimited single string that needs parsing
|
||||||
@Override
|
@Override
|
||||||
public void DeSerialzie(String string)
|
public void deSerialzie(String string)
|
||||||
{
|
{
|
||||||
if(string != null)
|
if(string != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class KittyUser extends DatabaseTrackedObject
|
|||||||
beans += amount;
|
beans += amount;
|
||||||
|
|
||||||
if(amount != 0)
|
if(amount != 0)
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ChangeRole(KittyRole newRole)
|
public void ChangeRole(KittyRole newRole)
|
||||||
@@ -44,7 +44,7 @@ public class KittyUser extends DatabaseTrackedObject
|
|||||||
if(newRole != role)
|
if(newRole != role)
|
||||||
{
|
{
|
||||||
role = newRole;
|
role = newRole;
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ public class KittyUser extends DatabaseTrackedObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String Serialize()
|
public String serialize()
|
||||||
{
|
{
|
||||||
return beans + "," + role.getValue();
|
return beans + "," + role.getValue();
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ public class KittyUser extends DatabaseTrackedObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void DeSerialzie(String string)
|
public void deSerialzie(String string)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -91,7 +91,7 @@ public class KittyUser extends DatabaseTrackedObject
|
|||||||
|
|
||||||
// Mark ourselves dirty to re-write the role information stored in the user.
|
// Mark ourselves dirty to re-write the role information stored in the user.
|
||||||
// Just uses defaults from earlier again.
|
// Just uses defaults from earlier again.
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
else
|
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 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.
|
// 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.
|
// Beans are maintained too, just in case there's some in cache.
|
||||||
MarkDirty();
|
markDirty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class UserInput
|
|||||||
mentions = FindMentionedUsers(event);
|
mentions = FindMentionedUsers(event);
|
||||||
|
|
||||||
toParse = toParse.trim();
|
toParse = toParse.trim();
|
||||||
String commandIndicator = guildContext.GetCommandIndicator();
|
String commandIndicator = guildContext.getCommandIndicator();
|
||||||
if(toParse.startsWith(commandIndicator))
|
if(toParse.startsWith(commandIndicator))
|
||||||
{
|
{
|
||||||
int loc = FindFirstWhitespace(toParse);
|
int loc = FindFirstWhitespace(toParse);
|
||||||
|
|||||||
Reference in New Issue
Block a user