Changeset 20795

Timestamp:

04/03/10 16:23:45 (2 years ago)

Author:

julie

Message:

put quotes around classnames in error messages to make it more obvious which fields are being used.

File:

• trunk/intermine/objectstore/main/src/org/intermine/objectstore/query/QueryField.java (modified) (5 diffs)

trunk/intermine/objectstore/main/src/org/intermine/objectstore/query/QueryField.java

@@ -56 +56 @@
             Method field = TypeUtil.getGetter(qc.getType(), fieldName);
             if (field == null) {
-                throw new IllegalArgumentException("Field " + fieldName + " not found in "
+                throw new IllegalArgumentException("Field '" + fieldName + "' not found in "
                         + qc.getType());
             }
             if (Collection.class.isAssignableFrom(field.getReturnType())) {
-                throw new IllegalArgumentException("Field " + fieldName + " is a collection type");
+                throw new IllegalArgumentException("Field '" + fieldName + "' is a collection type");
             }
             if (InterMineObject.class.isAssignableFrom(field.getReturnType())) {
-                throw new IllegalArgumentException("Field " + fieldName
-                        + " is an object reference");
+                throw new IllegalArgumentException("Field '" + fieldName
+                        + "' is an object reference");
             }
             this.qc = qc;
@@ -90 +90 @@
         Method field = TypeUtil.getGetter(qc.getType(), fieldName);
         if (field == null) {
-            throw new IllegalArgumentException("Field " + fieldName + " not found in "
+            throw new IllegalArgumentException("Field '" + fieldName + "' not found in "
                                            + qc.getType());
         }
         if (java.util.Collection.class.isAssignableFrom(field.getReturnType())) {
-            throw new IllegalArgumentException("Field " + fieldName + " is a collection type");
+            throw new IllegalArgumentException("Field '" + fieldName + "' is a collection type");
         }
         if (!(Number.class.isAssignableFrom(field.getReturnType())
@@ -101 +101 @@
                 || java.util.Date.class.isAssignableFrom(field.getReturnType())
                 || field.getReturnType().isPrimitive())) {
-            throw new IllegalArgumentException("Field " + fieldName + " is an object reference");
+            throw new IllegalArgumentException("Field '" + fieldName + "' is an object reference");
         }
         this.qc = q;
-        this.fieldName = (String) q.getAliases().get(qc);
+        this.fieldName = q.getAliases().get(qc);
         secondFieldName = fieldName;
         Class fieldType = field.getReturnType();
@@ -123 +123 @@
         }
         this.qc = q;
-        this.fieldName = (String) q.getAliases().get(v);
+        this.fieldName = q.getAliases().get(v);
         if (this.fieldName == null) {
             throw new NullPointerException("Field not found in subquery");
@@ -208 +208 @@
      * {@inheritDoc}
      */
-    public void youAreType(Class cls) {
+    public void youAreType(@SuppressWarnings("unused") Class cls) {
         throw new ClassCastException("youAreType called on a QueryField");
     }