Changeset 5

Timestamp:

08/19/2005 05:51:17 PM (21 years ago)

Author:

dsowen

Message:

Fixed: NPEs when using accessors from paths, &c. Included tests.
Fixed: parsing exception wasn't very enlightening.

Location:

trunk

Files:

• . (modified) (1 prop)
• .cvsignore (modified) (1 diff)
• project.xml (modified) (2 diffs)
• src/ws/fugue88/jpath/Context.java (modified) (5 diffs)
• src/ws/fugue88/jpath/Path.java (modified) (3 diffs)
• testsrc/ws/fugue88/ContextTest.java (added)
• testsrc/ws/fugue88/jpath/ContextTest.java (deleted)

trunk

@@ -2 +2 @@
 .classpath
 .project
+velocity.log

@@ -2 +2 @@
 .classpath
 .project
+velocity.log

trunk/.cvsignore

@@ -2 +2 @@
 .classpath
 .project
+velocity.log

trunk/project.xml

@@ -31 +31 @@
   <inceptionYear>2005</inceptionYear>
   <package>ws.fugue88.jpath</package>
-  <description>This is a small library that facilitates interaction with instance managers whose signatures aren't known at compile time. It assumes certain naming conventions that the instance managers are supposed to follow in order to locate and invoke the appropriate methods.</description>
+  <description><![CDATA[This library allows access to graphs of Java objects by path-like strings.  As a short example, suppose you have the following:</p>
+<source>
+class A {
+        String s;
+}
+class B {
+        A x;
+}
+</source>
+<p>Then, given an instance of class B, the path "/x/s" would provide access to the string <var>s</var>.</p>
+
+<p>Early-nulls (if <var>x</var> were <code>null</code>) are also supported (a la Expression Language), but so is automatic graph construction.  In such a case, a new instances of A would have been assigned to <var>x</var> to access the (still <code>null</code>) string <var>s</var>.]]></description>
   <!-- the project home page -->
   <url>http://maven.apache.org/reference/plugins/examples/</url>
@@ -41 +52 @@
        scm:<system>:<system specific connection string> -->
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
-    <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
+    <connection>scm:cvs:ext:devel.home:/srv/cvs:jpathlib</connection>
+    <!-- url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url -->
   </repository>
   <developers>

trunk/src/ws/fugue88/jpath/Context.java

@@ -3 +3 @@
  *
  * $Log$
+ * Revision 1.3  2005/08/19 17:51:17  dsowen
+ * Fixed: NPEs when using accessors from paths, &c.  Included tests.
+ * Fixed: parsing exception wasn't very enlightening.
+ *
  * Revision 1.2  2005/08/12 19:01:46  dsowen
  * Feature: can automatically fill missing parts of a graph.
@@ -18 +22 @@
 package ws.fugue88.jpath;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
@@ -34 +39 @@
         {
                 Context current = this;
-                Accessor accessor = null;
-                for(Iterator i = path.iterator(); i.hasNext();) {
-                        accessor = current.getTargetAccessor((PathPart)i.next());
+                for(Iterator i = path.parents().iterator(); i.hasNext();) {
+                        Accessor accessor = current.getTargetAccessor((PathPart)i.next());
                         Object obj = accessor.getValue();
                         if(obj == null) {
-                                if(_modifying && i.hasNext()) {
+                                if(_modifying) {
                                         obj = createBlank(accessor.getType());
                                         accessor.setValue(obj);
@@ -48 +52 @@
                         current = new Context(obj, _binder, _modifying);
                 }
-                return accessor;
+                return current.getTargetAccessor(path.terminal());
         }
 
@@ -109 +113 @@
 
         private Object createBlank(final Class type) throws IllegalAccessException,
-                        InstantiationException
+                        InstantiationException, InvocationTargetException
         {
-                return type.newInstance();
+                try {
+                        final Constructor ctor = type.getDeclaredConstructor(null);
+                        ctor.setAccessible(true);
+                        return ctor.newInstance(null);
+                } catch(NoSuchMethodException e) {
+                        throw new InstantiationException("Class " + type.getName()
+                                        + " must have a no-argument constructor.");
+                }
         }
 

trunk/src/ws/fugue88/jpath/Path.java

@@ -3 +3 @@
  *
  * $Log$
+ * Revision 1.2  2005/08/19 17:51:17  dsowen
+ * Fixed: NPEs when using accessors from paths, &c.  Included tests.
+ * Fixed: parsing exception wasn't very enlightening.
+ *
  * Revision 1.1  2005/08/03 00:35:29  dsowen
  * Initial commit.
@@ -51 +55 @@
                                 pp = new StringSelector(unquote(m.group(1)));
                         } else {
-                                throw new ParseException(null, -1);
+                                throw new ParseException(
+                                                "Expected identifier or selector, found '"
+                                                                + (buff.length() > 40 ? buff.subSequence(0, 37)
+                                                                                + "..." : buff) + "'.", -1);
                         }
                         _parts.add(pp);
@@ -63 +70 @@
         }
 
-        public String terminal()
+        public PathPart terminal()
         {
-                return (String)_parts.get(_parts.size() - 1);
+                return (PathPart)_parts.get(_parts.size() - 1);
         }
 

@@ -2 +2 @@
 .classpath
 .project
+velocity.log