Commits

John Paulett  committed 4ee4dbc

Use Eclipse to organize the Java imports and remove unused imports.

  • Participants
  • Parent commits 071a47f

Comments (0)

Files changed (216)

File src/main/java/org/nrg/xdat/XDAT.java

  */
 package org.nrg.xdat;
 
-import java.io.File;
 import java.util.Iterator;
 
 import org.apache.commons.configuration.Configuration;

File src/main/java/org/nrg/xdat/XDATTool.java

 import org.nrg.xft.exception.XFTInitException;
 import org.nrg.xft.generators.SQLCreateGenerator;
 import org.nrg.xft.references.XFTReferenceManager;
-import org.nrg.xft.schema.XFTManager; 
+import org.nrg.xft.schema.XFTManager;
 import org.nrg.xft.schema.Wrappers.XMLWrapper.SAXReader;
 import org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter;
 import org.nrg.xft.search.ItemSearch;

File src/main/java/org/nrg/xdat/ajax/EmailCustomSearch.java

 import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.mail.MessagingException;
 import javax.mail.internet.InternetAddress;
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
 import org.apache.log4j.Logger;
 import org.nrg.xdat.security.XDATUser;
 import org.nrg.xdat.turbine.utils.AdminUtils;

File src/main/java/org/nrg/xdat/ajax/StoreXML.java

  */
 package org.nrg.xdat.ajax;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.Iterator;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
 
 import org.apache.log4j.Logger;
 import org.nrg.xdat.security.XDATUser;
-import org.nrg.xdat.security.XdatStoredSearch;
 import org.nrg.xft.XFTItem;
-import org.nrg.xft.collections.ItemCollection;
 import org.nrg.xft.exception.ElementNotFoundException;
 import org.nrg.xft.exception.FieldNotFoundException;
 import org.nrg.xft.exception.XFTInitException;
 import org.nrg.xft.schema.Wrappers.XMLWrapper.SAXReader;
 import org.nrg.xft.schema.Wrappers.XMLWrapper.SAXWriter;
-import org.nrg.xft.search.ItemSearch;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 

File src/main/java/org/nrg/xdat/ajax/XMLSearch.java

 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
 import java.io.StringReader;
-import java.io.StringWriter;
 import java.util.Iterator;
 
 import javax.servlet.ServletConfig;

File src/main/java/org/nrg/xdat/display/ArcDefinition.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
  */
 package org.nrg.xdat.display;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
 /**
  * @author Tim
  *

File src/main/java/org/nrg/xdat/display/DisplayField.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
  *
  */
 package org.nrg.xdat.display;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
 
 import org.apache.log4j.Logger;
 import org.nrg.xdat.collections.DisplayFieldCollection.DisplayFieldNotFoundException;

File src/main/java/org/nrg/xdat/display/DisplayVersion.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
 import org.apache.log4j.Logger;
 import org.nrg.xdat.collections.DisplayFieldRefCollection;
 import org.nrg.xdat.collections.DisplayFieldCollection.DisplayFieldNotFoundException;
-import org.nrg.xdat.search.DisplayFieldWrapper;
 /**
  * @author Tim
  *

File src/main/java/org/nrg/xdat/display/ElementDisplay.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
  */
 package org.nrg.xdat.display;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Map.Entry;
 
 import org.apache.log4j.Logger;
 import org.apache.velocity.app.Velocity;
 import org.nrg.xdat.collections.DisplayFieldCollection;
-import org.nrg.xdat.collections.DisplayFieldCollection.DisplayFieldNotFoundException;
 import org.nrg.xdat.collections.DisplayFieldRefCollection.DuplicateDisplayFieldRefException;
 import org.nrg.xdat.schema.SchemaElement;
 import org.nrg.xdat.security.ElementSecurity;
+import org.nrg.xft.exception.ElementNotFoundException;
+import org.nrg.xft.exception.XFTInitException;
 import org.nrg.xft.schema.design.SchemaElementI;
 import org.nrg.xft.utils.StringUtils;
-import org.nrg.xft.exception.*;
 /**
  * @author Tim
  *

File src/main/java/org/nrg/xdat/display/HTMLLink.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
  *
  */
 package org.nrg.xdat.display;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
 /**
  * @author Tim
  *

File src/main/java/org/nrg/xdat/display/HTMLLinkProperty.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
  */
 package org.nrg.xdat.display;
 
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Map;
 /**
  * @author Tim
  *

File src/main/java/org/nrg/xdat/display/Mapping.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
  *
  */
 package org.nrg.xdat.display;
-import java.util.*;
+import java.util.ArrayList;
 /**
  * @author Tim
  *

File src/main/java/org/nrg/xdat/display/MappingColumn.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
 package org.nrg.xdat.display;
 
 import org.nrg.xft.db.ViewManager;
-import org.nrg.xft.exception.*;
+import org.nrg.xft.exception.ElementNotFoundException;
+import org.nrg.xft.exception.XFTInitException;
 import org.nrg.xft.schema.Wrappers.GenericWrapper.GenericWrapperElement;
 import org.nrg.xft.utils.StringUtils;
 

File src/main/java/org/nrg/xdat/display/SQLView.java

 //Copyright 2005 Harvard University / Howard Hughes Medical Institute (HHMI) All Rights Reserved
 /* 
- * XDAT � Extensible Data Archive Toolkit
+ * XDAT � Extensible Data Archive Toolkit
  * Copyright (C) 2005 Washington University
  */
 /*
  */
 package org.nrg.xdat.display;
 
-import java.util.*;
+import java.util.Comparator;
 /**
  * @author Tim
  *

File src/main/java/org/nrg/xdat/om/XdatAccessLog.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatAccessLog;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatAccessLogI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatActionType.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatActionType;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatActionTypeI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatCriteria.java

 import org.nrg.xdat.search.ElementCriteria;
 import org.nrg.xft.ItemI;
 import org.nrg.xft.exception.FieldNotFoundException;
-import org.nrg.xft.search.CriteriaCollection;
 import org.nrg.xft.search.SQLClause;
 import org.nrg.xft.search.SearchCriteria;
 import org.nrg.xft.security.UserI;

File src/main/java/org/nrg/xdat/om/XdatCriteriaI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatCriteriaSet.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xdat.search.DisplayCriteria;
-import org.nrg.xdat.search.ElementCriteria;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import org.nrg.xdat.om.base.BaseXdatCriteriaSet;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.search.SQLClause;
-import org.nrg.xft.search.SearchCriteria;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatCriteriaSetI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatElementAccess.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatElementAccess;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatElementAccessI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatElementAccessSecureIp.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatElementAccessSecureIp;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatElementAccessSecureIpI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatElementActionType.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatElementActionType;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatElementActionTypeI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatElementSecurity.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatElementSecurity;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatElementSecurityI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatElementSecurityListingAction.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatElementSecurityListingAction;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.exception.ElementNotFoundException;
 import org.nrg.xft.exception.FieldNotFoundException;
 import org.nrg.xft.exception.XFTInitException;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatElementSecurityListingActionI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatFieldMapping.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatFieldMapping;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatFieldMappingI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatFieldMappingSet.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatFieldMappingSet;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatFieldMappingSetI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatInfoentry.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatInfoentry;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatInfoentryI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatNewsentry.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatNewsentry;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatNewsentryI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatPrimarySecurityField.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatPrimarySecurityField;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatPrimarySecurityFieldI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatRoleType.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatRoleType;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatRoleTypeI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatSearch.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatSearch;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatSearchField.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Comparator;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatSearchField;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatSearchFieldI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatSearchI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatSecurity.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatSecurity;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatSecurityI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatStoredSearch.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Iterator;
+
 import org.nrg.xdat.collections.DisplayFieldCollection;
 import org.nrg.xdat.display.DisplayField;
-import org.nrg.xdat.om.base.*;
+import org.nrg.xdat.om.base.BaseXdatStoredSearch;
 import org.nrg.xdat.schema.SchemaElement;
 import org.nrg.xdat.search.DisplaySearch;
 import org.nrg.xdat.security.XdatCriteriaSet;
+import org.nrg.xft.ItemI;
+import org.nrg.xft.XFTItem;
 import org.nrg.xft.exception.ElementNotFoundException;
 import org.nrg.xft.exception.FieldNotFoundException;
 import org.nrg.xft.exception.XFTInitException;
 import org.nrg.xft.search.ItemSearch;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatStoredSearchAllowedUser.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatStoredSearchAllowedUser;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatStoredSearchAllowedUserI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatStoredSearchGroupid.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatStoredSearchGroupid;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatStoredSearchGroupidI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatStoredSearchI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatUser.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatUser;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatUserGroupid.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatUserGroupid;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatUserGroupidI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatUserI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatUserLogin.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.BaseXdatUserLogin;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/XdatUserLoginI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/XdatUsergroupI.java

  *
  */
 package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
+import java.util.ArrayList;
 
-import java.util.*;
+import org.nrg.xft.ItemI;
 
 /**
  * @author XDAT

File src/main/java/org/nrg/xdat/om/base/BaseXdatAccessLog.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatAccessLog;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatActionType.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatActionType;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatCriteria.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatCriteria;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatCriteriaSet.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatCriteriaSet;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatElementAccess.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatElementAccess;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatElementAccessSecureIp.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatElementAccessSecureIp;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatElementActionType.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatElementActionType;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatElementSecurity.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatElementSecurity;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatElementSecurityListingAction.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatElementSecurityListingAction;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatFieldMapping.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatFieldMapping;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatFieldMappingSet.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatFieldMappingSet;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatInfoentry.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatInfoentry;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatNewsentry.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatNewsentry;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatPrimarySecurityField.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatPrimarySecurityField;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatRoleType.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatRoleType;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatSearch.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatSearch;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatSearchField.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatSearchField;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *

File src/main/java/org/nrg/xdat/om/base/BaseXdatSecurity.java

  *
  */
 package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
+import java.util.Hashtable;
+
+import org.nrg.xdat.om.base.auto.AutoXdatSecurity;
+import org.nrg.xft.ItemI;
 import org.nrg.xft.security.UserI;
 
-import java.util.*;
-
 /**
  * @author XDAT
  *