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

Cut the number of times a service class needs to be specified to two

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4993 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Charlie Groves
2008-04-10 01:18:32 +00:00
parent 839d722abf
commit b65487f318
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/client/Client.java
+5 -4
View File
@@ -283,7 +283,7 @@ public class Client
* {@link InvocationService} derivation. <code>null</code> is returned if no such service * {@link InvocationService} derivation. <code>null</code> is returned if no such service
* could be found. * could be found.
*/ */
public InvocationService getService (Class sclass) public <T> T getService (Class<T> sclass)
{ {
if (_bstrap == null) { if (_bstrap == null) {
return null; return null;
@@ -292,7 +292,8 @@ public class Client
for (int ii = 0; ii < scount; ii++) { for (int ii = 0; ii < scount; ii++) {
InvocationService service = _bstrap.services.get(ii); InvocationService service = _bstrap.services.get(ii);
if (sclass.isInstance(service)) { if (sclass.isInstance(service)) {
return service; @SuppressWarnings("unchecked") T asSclass = (T)service;
return asSclass;
} }
} }
return null; return null;
@@ -303,9 +304,9 @@ public class Client
* not available. Useful to avoid redundant error checking when you know that the shit will hit * not available. Useful to avoid redundant error checking when you know that the shit will hit
* the fan if a particular invocation service is not available. * the fan if a particular invocation service is not available.
*/ */
public InvocationService requireService (Class sclass) public <T> T requireService (Class<T> sclass)
{ {
InvocationService isvc = getService(sclass); T isvc = getService(sclass);
if (isvc == null) { if (isvc == null) {
throw new RuntimeException( throw new RuntimeException(
sclass.getName() + " isn't available. I can't bear to go on."); sclass.getName() + " isn't available. I can't bear to go on.");