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

blank() -> isBlank().

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3749 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2005-11-09 04:00:16 +00:00
parent 365634146c
commit 596d2a4708
26 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/admin/server/ConfObjRegistry.java
+1 -1
View File
@@ -264,7 +264,7 @@ public class ConfObjRegistry
// don't freak out if the conf is blank.
String value = config.getValue(key, "");
if (StringUtil.blank(value)) {
if (StringUtil.isBlank(value)) {
return;
}
src/java/com/threerings/cast/tools/xml/ActionRuleSet.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: ActionRuleSet.java,v 1.4 2004/08/27 02:12:28 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -129,7 +129,7 @@ public class ActionRuleSet extends RuleSetBase
*/
public static String validate (ActionSequence seq)
{
if (StringUtil.blank(seq.name)) {
if (StringUtil.isBlank(seq.name)) {
return "Missing 'name' definition.";
}
if (seq.framesPerSecond == 0) {
src/java/com/threerings/crowd/chat/client/ChatDirector.java
+6 -6
View File
@@ -422,7 +422,7 @@ public class ChatDirector extends BasicDirector
// if not a command then just speak
String message = text.trim();
if (StringUtil.blank(message)) {
if (StringUtil.isBlank(message)) {
// report silent failure for now
return ChatCodes.SUCCESS;
}
@@ -673,7 +673,7 @@ public class ChatDirector extends BasicDirector
// note whether or not we have an auto-response
BodyObject self = (BodyObject)
_ctx.getClient().getClientObject();
if (!StringUtil.blank(self.awayMessage)) {
if (!StringUtil.isBlank(self.awayMessage)) {
autoResponse = self.awayMessage;
}
}
@@ -1090,7 +1090,7 @@ public class ChatDirector extends BasicDirector
String hcmd = "";
// grab the command they want help on
if (!StringUtil.blank(args)) {
if (!StringUtil.isBlank(args)) {
hcmd = args;
int sidx = args.indexOf(" ");
if (sidx != -1) {
@@ -1150,7 +1150,7 @@ public class ChatDirector extends BasicDirector
public String handleCommand (
SpeakService speakSvc, String command, String args, String[] history)
{
if (StringUtil.blank(args)) {
if (StringUtil.isBlank(args)) {
return "m.usage_speak";
}
// note the command to be stored in the history
@@ -1165,7 +1165,7 @@ public class ChatDirector extends BasicDirector
public String handleCommand (
SpeakService speakSvc, String command, String args, String[] history)
{
if (StringUtil.blank(args)) {
if (StringUtil.isBlank(args)) {
return "m.usage_emote";
}
// note the command to be stored in the history
@@ -1180,7 +1180,7 @@ public class ChatDirector extends BasicDirector
public String handleCommand (
SpeakService speakSvc, String command, String args, String[] history)
{
if (StringUtil.blank(args)) {
if (StringUtil.isBlank(args)) {
return "m.usage_think";
}
// note the command to be stored in the history
src/java/com/threerings/crowd/chat/server/ChatProvider.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class ChatProvider
idle = System.currentTimeMillis() - tobj.statusTime;
}
String awayMessage = null;
if (!StringUtil.blank(tobj.awayMessage)) {
if (!StringUtil.isBlank(tobj.awayMessage)) {
awayMessage = tobj.awayMessage;
}
listener.tellSucceeded(idle, awayMessage);
src/java/com/threerings/jme/JmeApp.java
+1 -1
View File
@@ -460,7 +460,7 @@ public class JmeApp
{
String cfgdir = ".narya";
String home = System.getProperty("user.home");
if (!StringUtil.blank(home)) {
if (!StringUtil.isBlank(home)) {
cfgdir = home + File.separator + cfgdir;
}
// create the configuration directory if it does not already exist
src/java/com/threerings/media/IconManager.java
+2 -2
View File
@@ -117,12 +117,12 @@ public class IconManager
// load it up if not
if (set == null) {
String path = _config.getProperty(iconSet + PATH_SUFFIX);
if (StringUtil.blank(path)) {
if (StringUtil.isBlank(path)) {
throw new Exception("No path specified for icon set");
}
String metstr = _config.getProperty(iconSet + METRICS_SUFFIX);
if (StringUtil.blank(metstr)) {
if (StringUtil.isBlank(metstr)) {
throw new Exception("No metrics specified for icon set");
}
src/java/com/threerings/media/image/ImageManager.java
+1 -1
View File
@@ -179,7 +179,7 @@ public class ImageManager
public BufferedImage getImage (String rset, String path,
Colorization[] zations)
{
if (StringUtil.blank(path)) {
if (StringUtil.isBlank(path)) {
String errmsg = "Invalid image path [rset=" + rset +
", path=" + path + "]";
throw new IllegalArgumentException(errmsg);
src/java/com/threerings/media/sound/SoundManager.java
+2 -2
View File
@@ -548,7 +548,7 @@ public class SoundManager
*/
protected boolean isTesting ()
{
return !StringUtil.blank(_testDir.getValue());
return !StringUtil.isBlank(_testDir.getValue());
}
/**
@@ -608,7 +608,7 @@ public class SoundManager
protected InputStream getTestClip (SoundKey key)
{
String testDirectory = _testDir.getValue();
if (StringUtil.blank(testDirectory)) {
if (StringUtil.isBlank(testDirectory)) {
return null;
}
src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java
+2 -2
View File
@@ -101,14 +101,14 @@ public abstract class TileSetRuleSet
boolean valid = true;
// check for the 'name' attribute
if (StringUtil.blank(set.getName())) {
if (StringUtil.isBlank(set.getName())) {
Log.warning("Tile set definition missing 'name' attribute " +
"[set=" + set + "].");
valid = false;
}
// check for an <imagePath> element
if (StringUtil.blank(set.getImagePath())) {
if (StringUtil.isBlank(set.getImagePath())) {
Log.warning("Tile set definition missing <imagePath> element " +
"[set=" + set + "].");
valid = false;
src/java/com/threerings/micasa/lobby/LobbyConfig.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class LobbyConfig extends PlaceConfig
throws Exception
{
String value = config.getProperty(key);
if (StringUtil.blank(value)) {
if (StringUtil.isBlank(value)) {
throw new Exception("Missing '" + key + "' definition in " +
"lobby configuration.");
}
src/java/com/threerings/micasa/lobby/LobbyManager.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: LobbyManager.java,v 1.8 2004/08/27 02:12:50 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -57,7 +57,7 @@ public class LobbyManager extends PlaceManager
throws Exception
{
String value = config.getProperty(key);
if (StringUtil.blank(value)) {
if (StringUtil.isBlank(value)) {
throw new Exception("Missing '" + key + "' definition in " +
"lobby configuration.");
}
src/java/com/threerings/micasa/lobby/LobbyRegistry.java
+1 -1
View File
@@ -135,7 +135,7 @@ public class LobbyRegistry
// get the lobby manager class and UGI
String cfgClass = props.getProperty("config");
if (StringUtil.blank(cfgClass)) {
if (StringUtil.isBlank(cfgClass)) {
throw new Exception("Missing 'config' definition in " +
"lobby configuration.");
}
src/java/com/threerings/miso/client/MisoScenePanel.java
+2 -2
View File
@@ -1033,7 +1033,7 @@ public class MisoScenePanel extends VirtualMediaPanel
String action = scobj.info.action;
// if the object has no action, skip it
if (StringUtil.blank(action)) {
if (StringUtil.isBlank(action)) {
continue;
}
@@ -1165,7 +1165,7 @@ public class MisoScenePanel extends VirtualMediaPanel
*/
protected boolean skipHitObject (SceneObject scobj)
{
return StringUtil.blank(scobj.info.action);
return StringUtil.isBlank(scobj.info.action);
}
/**
src/java/com/threerings/miso/client/ObjectActionHandler.java
+3 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: ObjectActionHandler.java,v 1.3 2004/08/27 02:20:06 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -89,7 +89,7 @@ public class ObjectActionHandler
*/
public static String getType (String command)
{
int cidx = StringUtil.blank(command) ? -1 : command.indexOf(':');
int cidx = StringUtil.isBlank(command) ? -1 : command.indexOf(':');
return (cidx == -1) ? "" : command.substring(0, cidx);
}
@@ -99,7 +99,7 @@ public class ObjectActionHandler
*/
public static String getAction (String command)
{
int cidx = StringUtil.blank(command) ? -1 : command.indexOf(':');
int cidx = StringUtil.isBlank(command) ? -1 : command.indexOf(':');
return (cidx == -1) ? command : command.substring(cidx+1);
}
src/java/com/threerings/miso/data/ObjectInfo.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class ObjectInfo extends SimpleStreamableObject
*/
public boolean isInteresting ()
{
return (!StringUtil.blank(action) || priority != 0 ||
return (!StringUtil.isBlank(action) || priority != 0 ||
sx != 0 || sy != 0 || zations != 0);
}
src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java
+2 -2
View File
@@ -90,7 +90,7 @@ public class FringeConfigurationParser extends CompiledConfigParser
for (int ii=0; ii < attrs.getLength(); ii++) {
String name = attrs.getLocalName(ii);
if (StringUtil.blank(name)) {
if (StringUtil.isBlank(name)) {
name = attrs.getQName(ii);
}
String value = attrs.getValue(ii);
@@ -139,7 +139,7 @@ public class FringeConfigurationParser extends CompiledConfigParser
for (int ii=0; ii < attrs.getLength(); ii++) {
String name = attrs.getLocalName(ii);
if (StringUtil.blank(name)) {
if (StringUtil.isBlank(name)) {
name = attrs.getQName(ii);
}
String value = attrs.getValue(ii);
src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SimpleMisoSceneParser.java,v 1.3 2004/08/27 02:20:09 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -49,7 +49,7 @@ public class SimpleMisoSceneParser
SimpleMisoSceneRuleSet set = new SimpleMisoSceneRuleSet();
// configure our top-level path prefix
if (StringUtil.blank(prefix)) {
if (StringUtil.isBlank(prefix)) {
_prefix = set.getOuterElement();
} else {
_prefix = prefix + "/" + set.getOuterElement();
src/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SimpleMisoSceneWriter.java,v 1.2 2004/08/27 02:20:09 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -87,7 +87,7 @@ public class SimpleMisoSceneWriter implements NestableWriter
attrs.addAttribute("", "x", "", "", String.valueOf(info.x));
attrs.addAttribute("", "y", "", "", String.valueOf(info.y));
if (!StringUtil.blank(info.action)) {
if (!StringUtil.isBlank(info.action)) {
attrs.addAttribute("", "action", "", "", info.action);
}
src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SparseMisoSceneParser.java,v 1.4 2004/08/27 02:20:09 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -50,7 +50,7 @@ public class SparseMisoSceneParser
SparseMisoSceneRuleSet set = new SparseMisoSceneRuleSet();
// configure our top-level path prefix
if (StringUtil.blank(prefix)) {
if (StringUtil.isBlank(prefix)) {
_prefix = set.getOuterElement();
} else {
_prefix = prefix + "/" + set.getOuterElement();
src/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SparseMisoSceneWriter.java,v 1.4 2004/08/27 02:20:09 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -102,7 +102,7 @@ public class SparseMisoSceneWriter implements NestableWriter
attrs.addAttribute("", "x", "", "", String.valueOf(info.x));
attrs.addAttribute("", "y", "", "", String.valueOf(info.y));
if (!StringUtil.blank(info.action)) {
if (!StringUtil.isBlank(info.action)) {
attrs.addAttribute("", "action", "", "", info.action);
}
if (info.priority != 0) {
src/java/com/threerings/presents/tools/GenDObjectTask.java
+4 -4
View File
@@ -307,13 +307,13 @@ public class GenDObjectTask extends Task
}
if (fsection.length() > 0) {
String prev = get(lines, nstart-1);
if (!StringUtil.blank(prev) && !prev.equals("{")) {
if (!StringUtil.isBlank(prev) && !prev.equals("{")) {
bout.newLine();
}
writeln(bout, " " + FIELDS_START);
bout.write(fsection.toString());
writeln(bout, " " + FIELDS_END);
if (!StringUtil.blank(get(lines, nend))) {
if (!StringUtil.isBlank(get(lines, nend))) {
bout.newLine();
}
}
@@ -322,14 +322,14 @@ public class GenDObjectTask extends Task
}
if (msection.length() > 0) {
if (!StringUtil.blank(get(lines, mstart-1))) {
if (!StringUtil.isBlank(get(lines, mstart-1))) {
bout.newLine();
}
writeln(bout, " " + METHODS_START);
bout.write(msection.toString());
writeln(bout, " " + METHODS_END);
String next = get(lines, mend);
if (!StringUtil.blank(next) && !next.equals("}")) {
if (!StringUtil.isBlank(next) && !next.equals("}")) {
bout.newLine();
}
}
src/java/com/threerings/resource/Handler.java
+3 -3
View File
@@ -98,9 +98,9 @@ public class Handler extends URLStreamHandler
try {
// if there are query parameters, we need special magic
String query = url.getQuery();
if (!StringUtil.blank(query)) {
if (!StringUtil.isBlank(query)) {
_stream = getStream(bundle, path, query);
} else if (StringUtil.blank(bundle)) {
} else if (StringUtil.isBlank(bundle)) {
_stream = _rmgr.getResource(path);
} else {
_stream = _rmgr.getResource(bundle, path);
@@ -177,7 +177,7 @@ public class Handler extends URLStreamHandler
// locate the tile image, then write that subimage back out in PNG
// format into memory and return an input stream for that
ImageInputStream stream =
StringUtil.blank(bundle) ? _rmgr.getImageResource(path)
StringUtil.isBlank(bundle) ? _rmgr.getImageResource(path)
: _rmgr.getImageResource(bundle, path);
BufferedImage src = ImageIO.read(stream);
Rectangle trect = GeomUtil.getTile(
src/java/com/threerings/stage/tools/editor/EditorApp.java
+2 -2
View File
@@ -176,10 +176,10 @@ public class EditorApp implements Runnable
public static String localDataDir (String subdir)
{
String appdir = System.getProperty("appdir");
if (StringUtil.blank(appdir)) {
if (StringUtil.isBlank(appdir)) {
appdir = ".narya-editor";
String home = System.getProperty("user.home");
if (!StringUtil.blank(home)) {
if (!StringUtil.isBlank(home)) {
appdir = home + File.separator + appdir;
}
}
src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
+1 -1
View File
@@ -142,7 +142,7 @@ public class ObjectEditorDialog extends JInternalFrame
protected Object[] computeZations (String[] zations, int index)
{
if (zations.length <= index || StringUtil.blank(zations[index])) {
if (zations.length <= index || StringUtil.isBlank(zations[index])) {
return null;
}
ColorPository cpos = _ctx.getColorPository();
src/java/com/threerings/util/MessageManager.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class MessageManager
String mbclass = null;
try {
mbclass = rbundle.getString(MBUNDLE_CLASS_KEY);
if (!StringUtil.blank(mbclass)) {
if (!StringUtil.isBlank(mbclass)) {
bundle = (MessageBundle)
Class.forName(mbclass).newInstance();
}
src/java/com/threerings/whirled/tools/xml/SceneParser.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneParser.java,v 1.3 2004/08/27 02:20:48 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -50,7 +50,7 @@ public class SceneParser
SceneRuleSet set = createSceneRuleSet();
// configure our top-level path prefix
if (StringUtil.blank(prefix)) {
if (StringUtil.isBlank(prefix)) {
_prefix = set.getOuterElement();
} else {
_prefix = prefix + "/" + set.getOuterElement();