Add matchesType() and asType() to Elements

DenizenScript · Dec 12, 2013 · 3fdbb97 · 3fdbb97
1 parent 3333265
commit 3fdbb97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java
@@ -151,6 +151,14 @@ public String asString() {
         return element;
     }
 
+    public boolean matchesType(Class<? extends dObject> dClass) {
+        return ObjectFetcher.checkMatch(dClass, element);
+    }
+
+    public <T extends dObject> T asType(Class<T> dClass) {
+        return ObjectFetcher.getObjectFrom(dClass, element);
+    }
+
     private String prefix;
 
     @Override

diff --git a/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java b/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java
@@ -96,9 +96,9 @@ public static boolean checkMatch(Class<? extends dObject> dClass, String value)
 
     }
 
-    public static dObject getObjectFrom(Class<? extends dObject> dClass, String value) {
+    public static <T extends dObject> T getObjectFrom(Class<T> dClass, String value) {
         try {
-            return (dObject) valueof.get(dClass).invoke(null, value);
+            return (T) valueof.get(dClass).invoke(null, value);
         } catch (Exception e) {
             dB.echoError(e);
         }