diff options
Diffstat (limited to 'src/com/memberwebs/ldapxml/LXReader.java')
-rw-r--r-- | src/com/memberwebs/ldapxml/LXReader.java | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/com/memberwebs/ldapxml/LXReader.java b/src/com/memberwebs/ldapxml/LXReader.java index 3e525f1..4f62c01 100644 --- a/src/com/memberwebs/ldapxml/LXReader.java +++ b/src/com/memberwebs/ldapxml/LXReader.java @@ -52,13 +52,13 @@ import java.util.Vector; import org.w3c.dom.Document; import org.w3c.dom.Element; -import com.memberwebs.ldapxml.helpers.LXAttribute; -import com.memberwebs.ldapxml.helpers.LXBase; -import com.memberwebs.ldapxml.helpers.LXClass; import com.memberwebs.ldapxml.helpers.LXDefaultConvert; import com.memberwebs.ldapxml.helpers.LXDefaultHook; -import com.memberwebs.ldapxml.helpers.LXEntry; -import com.memberwebs.ldapxml.helpers.LXRoot; +import com.memberwebs.ldapxml.map.*; +import com.memberwebs.ldapxml.map.LXAttribute; +import com.memberwebs.ldapxml.map.LXBase; +import com.memberwebs.ldapxml.map.LXClass; +import com.memberwebs.ldapxml.map.LXEntry; import com.novell.ldap.LDAPAttribute; import com.novell.ldap.LDAPAttributeSchema; import com.novell.ldap.LDAPCompareAttrNames; @@ -122,7 +122,7 @@ public class LXReader public final void setMap(LXMap map) throws LXException { - if(map.getRoot() == null) + if(map == null) throw new LXException("Must supply a valid loaded map"); m_map = map; @@ -264,8 +264,7 @@ public class LXReader } // Create the root element etc... - LXRoot lx = m_map.getRoot(); - Element root = createElement(doc, lx); + Element root = createElement(doc, m_map); return new LXResults(doc, els, root); } @@ -280,11 +279,10 @@ public class LXReader public LXResults retrieveBlank(Document doc) throws LXException { - if(m_map == null || m_map.getRoot() == null) + if(m_map == null) throw new LXException("Must supply a valid loaded map"); - LXRoot lx = m_map.getRoot(); - Element root = createElement(doc, lx); + Element root = createElement(doc, m_map); return new LXResults(doc, new Vector(), root); } @@ -382,8 +380,6 @@ public class LXReader // We retrieve the whole thing for efficiency refreshSchema(); - LXRoot root = m_map.getRoot(); - // Get all the classes we use them to determine a number // of things LDAPAttribute objectClasses = entry.getAttribute(CLASS); @@ -398,7 +394,7 @@ public class LXReader for(int i = 0; i < classes.length; i++) { - lxentry = root.getEntry(classes[i]); + lxentry = m_map.getEntry(classes[i]); if(lxentry != null) break; } @@ -737,7 +733,7 @@ public class LXReader if(m_connection == null || !m_connection.isConnected()) throw new LXException("Must supply a valid open connection"); - if(m_map == null || m_map.getRoot() == null) + if(m_map == null) throw new LXException("Must supply a valid loaded map"); } |