AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

405 modified source files and 17,367 lines of diffs later we now enforce

Browse Source 
more discipline when handling names in our code base. Any user entered
name should find its way into a Name object as soon as it comes out of a
text field or whatnot, and stay that way until it makes its way into a
text field or into a database record (for which String objects are vastly
simpler because of JORA magic).

Dear God, let me never again make a change this large for the rest of my
mortal life.

Unfortunately, this means we have to keep an eye out for funny business
pretty much everywhere. However, since we will absolutely want to test
market stalls and so forth on Azure, we'll have an opportunity to iron out
any funny business that might fall under the radar during our internal
testing.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2980 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-03-06 11:29:19 +00:00
parent 92b716d790
commit 32dee3cbaf
58 changed files with 335 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/data/ParlorMarshaller.java
+3 -7
View File
@@ -1,5 +1,5 @@
//
// $Id: ParlorMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
// $Id: ParlorMarshaller.java,v 1.3 2004/03/06 11:29:19 mdb Exp $
package com.threerings.parlor.data;
@@ -11,6 +11,7 @@ import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.util.Name;
/**
* Provides the implementation of the {@link ParlorService} interface
@@ -18,10 +19,6 @@ import com.threerings.presents.dobj.InvocationResponseEvent;
* on the server. Also provides an implementation of the response listener
* interfaces that marshall the response arguments and deliver them back
* to the requesting client.
*
* <p> Generated from <code>
* $Id: ParlorMarshaller.java,v 1.2 2002/08/20 19:38:14 mdb Exp $
* </code>
*/
public class ParlorMarshaller extends InvocationMarshaller
implements ParlorService
@@ -92,7 +89,7 @@ public class ParlorMarshaller extends InvocationMarshaller
public static final int INVITE = 1;
// documentation inherited from interface
public void invite (Client arg1, String arg2, GameConfig arg3, InviteListener arg4)
public void invite (Client arg1, Name arg2, GameConfig arg3, InviteListener arg4)
{
InviteMarshaller listener4 = new InviteMarshaller();
listener4.listener = arg4;
@@ -166,5 +163,4 @@ public class ParlorMarshaller extends InvocationMarshaller
});
}
// Class file generated on 12:33:04 08/20/02.
}
src/java/com/threerings/parlor/data/Table.java
+17 -18
View File
@@ -1,9 +1,10 @@
//
// $Id: Table.java,v 1.16 2003/03/27 23:45:04 mdb Exp $
// $Id: Table.java,v 1.17 2004/03/06 11:29:19 mdb Exp $
package com.threerings.parlor.data;
import com.samskivert.util.StringUtil;
import com.threerings.util.Name;
import com.threerings.presents.dobj.DSet;
@@ -30,7 +31,7 @@ public class Table
/** An array of the usernames of the occupants of this table (some
* slots may not be filled). */
public String[] occupants;
public Name[] occupants;
/** The body oids of the occupants of this table. (This is not
* propagated to remote instances.) */
@@ -64,7 +65,7 @@ public class Table
this.config = config;
// make room for the maximum number of players
occupants = new String[_tconfig.getMaximumPlayers()];
occupants = new Name[_tconfig.getMaximumPlayers()];
bodyOids = new int[occupants.length];
}
@@ -90,21 +91,21 @@ public class Table
* the players in the game, sized properly and with each player in the
* appropriate position.
*/
public String[] getPlayers ()
public Name[] getPlayers ()
{
// count up the players
int pcount = 0;
for (int i = 0; i < occupants.length; i++) {
if (!StringUtil.blank(occupants[i])) {
if (occupants[i] != null) {
pcount++;
}
}
// create and populate the players array
String[] players = new String[pcount];
Name[] players = new Name[pcount];
pcount = 0;
for (int i = 0; i < occupants.length; i++) {
if (!StringUtil.blank(occupants[i])) {
if (occupants[i] != null) {
players[pcount++] = occupants[i];
}
}
@@ -124,7 +125,7 @@ public class Table
* code explaining the failure if the user was not able to be seated
* at that position.
*/
public String setOccupant (int position, String username, int bodyOid)
public String setOccupant (int position, Name username, int bodyOid)
{
// find out how many positions we have for occupation
int maxpos = _tconfig.getDesiredPlayers();
@@ -139,7 +140,7 @@ public class Table
}
// make sure the requested position is not already occupied
if (!StringUtil.blank(occupants[position])) {
if (occupants[position] != null) {
return TABLE_POSITION_OCCUPIED;
}
@@ -157,11 +158,11 @@ public class Table
* removed, false if the user was never seated at the table in the
* first place.
*/
public boolean clearOccupant (String username)
public boolean clearOccupant (Name username)
{
for (int i = 0; i < occupants.length; i++) {
if (username.equals(occupants[i])) {
occupants[i] = "";
occupants[i] = null;
bodyOids[i] = 0;
return true;
}
@@ -181,7 +182,7 @@ public class Table
{
for (int i = 0; i < bodyOids.length; i++) {
if (bodyOid == bodyOids[i]) {
occupants[i] = "";
occupants[i] = null;
bodyOids[i] = 0;
return true;
}
@@ -198,7 +199,7 @@ public class Table
// make sure at least the minimum number of players are here
int want = _tconfig.getMinimumPlayers(), have = 0;
for (int i = 0; i < occupants.length; i++) {
if (!StringUtil.blank(occupants[i])) {
if (occupants[i] != null) {
if (++have == want) {
return true;
}
@@ -218,10 +219,8 @@ public class Table
need = _tconfig.getMaximumPlayers();
}
for (int i = 0; i < occupants.length; i++) {
if (StringUtil.blank(occupants[i])) {
if (--need == 0) {
return true;
}
if (occupants[i] != null && --need == 0) {
return true;
}
}
return false;
@@ -233,7 +232,7 @@ public class Table
public boolean isEmpty ()
{
for (int i = 0; i < occupants.length; i++) {
if (!StringUtil.blank(occupants[i])) {
if (occupants[i] != null) {
return false;
}
}