Menu
▾
▴
[Aplaws-commit] r757 - ccm-auth-http/trunk/src/com/arsdigita/auth/http ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin
|
From: <ssk...@vh...> - 2005-09-02 15:34:26
|
Author: sskracic Date: 2005-09-02 17:25:32 +0200 (Fri, 02 Sep 2005) New Revision: 757 Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java Log: NFC: completing the import trimming. Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthServlet.java 2005-09-02 15:25:32 UTC (rev 757) @@ -16,12 +16,18 @@ package com.arsdigita.auth.http; -import java.io.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; -import java.security.*; -import javax.crypto.*; +import java.io.IOException; +import java.net.URLEncoder; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import java.security.GeneralSecurityException; +import java.security.PrivateKey; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.ShortBufferException; import sun.misc.BASE64Encoder; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/Inet4AddressRange.java 2005-09-02 15:25:32 UTC (rev 757) @@ -16,8 +16,8 @@ package com.arsdigita.auth.http; -import java.net.*; -import java.security.*; +import java.net.InetAddress; +import java.net.UnknownHostException; import com.arsdigita.util.Assert; import com.arsdigita.util.UncheckedWrapperException; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/AddUserPane.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,7 +15,8 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.RequestLocal; +import com.arsdigita.bebop.SimpleContainer; public class AddUserPane extends SimpleContainer { public AddUserPane() { Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/EditUserPane.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,8 +15,6 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.auth.http.*; - import com.arsdigita.bebop.BoxPanel; import com.arsdigita.bebop.Component; import com.arsdigita.bebop.ControlLink; @@ -27,18 +25,21 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.list.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.list.ListCellRenderer; +import com.arsdigita.bebop.list.ListModel; +import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.domain.DataObjectNotFoundException; -import com.arsdigita.kernel.*; -import com.arsdigita.persistence.*; - +import com.arsdigita.kernel.User; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.Filter; +import com.arsdigita.persistence.SessionManager; import java.math.BigDecimal; - import javax.servlet.ServletException; - import org.apache.log4j.Category; public class EditUserPane extends SimpleContainer { Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UpdateUsersForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -1,7 +1,7 @@ /* * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved. * - * The contents of this file are subject to the ArsDigita Public + * The contents of this file are subject to the ArsDigita Public * License (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of * the License at http://www.arsdigita.com/ADPL.txt @@ -20,24 +20,28 @@ import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.List; +import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.Page; import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.list.*; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.FileUpload; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.list.ListCellRenderer; +import com.arsdigita.bebop.list.ListModel; +import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.dispatcher.MultipartHttpServletRequest; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.Element; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.Iterator; +import java.util.Vector; +import org.apache.log4j.Logger; -import org.apache.log4j.Logger; - public class UpdateUsersForm extends Form implements FormProcessListener, ListCellRenderer { @@ -156,7 +160,7 @@ Vector invalidUsers = new Vector(); m_failedUsers.set( ps, failedUsers ); m_invalidUsers.set( ps, invalidUsers ); - + while (UserCSVEntry.hasMore()) { UserCSVEntry entry = UserCSVEntry.nextEntry(); if (entry == null) { Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserCSVEntry.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,17 +15,17 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.auth.http.*; +import com.arsdigita.auth.http.UserLogin; -import com.arsdigita.persistence.metadata.*; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.kernel.User; import com.arsdigita.kernel.PersonName; import com.arsdigita.kernel.EmailAddress; import com.arsdigita.util.Assert; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.Reader; +import java.util.ArrayList; import org.apache.log4j.Logger; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -15,13 +15,25 @@ package com.arsdigita.auth.http.ui; -import com.arsdigita.auth.http.*; import com.arsdigita.auth.http.UserLogin; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.kernel.*; +import com.arsdigita.auth.http.UserLogin; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.RequestLocal; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.parameters.EmailParameter; +import com.arsdigita.bebop.parameters.NotEmptyValidationListener; +import com.arsdigita.kernel.EmailAddress; +import com.arsdigita.kernel.PersonName; +import com.arsdigita.kernel.UserAuthentication; +import com.arsdigita.kernel.User; import javax.mail.internet.InternetAddress; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/ui/UserManageForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -1,7 +1,7 @@ /* * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved. * - * The contents of this file are subject to the ArsDigita Public + * The contents of this file are subject to the ArsDigita Public * License (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of * the License at http://www.arsdigita.com/ADPL.txt @@ -12,16 +12,23 @@ * rights and limitations under the License. * */ - + package com.arsdigita.auth.http.ui; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.persistence.*; +import com.arsdigita.bebop.BoxPanel; +import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.event.PrintEvent; +import com.arsdigita.bebop.event.PrintListener; +import com.arsdigita.bebop.form.Option; +import com.arsdigita.bebop.form.SingleSelect; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.UncheckedWrapperException; - import java.util.TooManyListenersException; public class UserManageForm extends Form { @@ -36,7 +43,7 @@ private Submit m_submit = new Submit( "Add/Edit User" ); private ColumnPanel m_editForm = new ColumnPanel( 2 ); - + public UserManageForm() { super( FORM_NAME, new BoxPanel( BoxPanel.VERTICAL ) ); Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Answer.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,21 +18,16 @@ */ package com.arsdigita.simplesurvey; - -import com.arsdigita.kernel.*; - -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; - -import com.arsdigita.domain.*; - -import com.arsdigita.formbuilder.*; - import com.arsdigita.db.Sequences; - +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; - /** * A SurveyAnswer object represents a response by a user to * a survey at a certain point in time. A survey response consists Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Initializer.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,9 +18,13 @@ */ package com.arsdigita.simplesurvey; -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.LegacyInitializer; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; /** * The CMS initializer. Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Loader.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,27 +18,16 @@ */ package com.arsdigita.simplesurvey; -import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.kernel.ACSObjectInstantiator; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.loader.PackageLoader; -import com.arsdigita.db.*; -import com.arsdigita.domain.*; -import com.arsdigita.mimetypes.*; -import com.arsdigita.util.*; -import com.arsdigita.util.config.*; -import com.arsdigita.util.csv.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.*; -import com.arsdigita.kernel.permissions.*; -import com.arsdigita.persistence.*; -import com.arsdigita.portal.*; -import com.arsdigita.web.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.sql.*; - +import com.arsdigita.persistence.DataObject; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.web.Application; +import com.arsdigita.web.ApplicationSetup; +import com.arsdigita.web.ApplicationType; import org.apache.log4j.Logger; /** Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/Response.java 2005-09-02 15:25:32 UTC (rev 757) @@ -18,21 +18,20 @@ */ package com.arsdigita.simplesurvey; - -import com.arsdigita.kernel.*; - -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; - -import com.arsdigita.domain.*; - -import com.arsdigita.formbuilder.*; - - +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.kernel.User; +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.metadata.ObjectType; import java.math.BigDecimal; import java.util.Date; - /** * A SurveyResponse object represents a response by a user to * a survey at a certain point in time. A survey response consists Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/RecentPollForm.java 2005-09-02 15:25:32 UTC (rev 757) @@ -22,10 +22,13 @@ import com.arsdigita.simplesurvey.Poll; import com.arsdigita.simplesurvey.ui.SurveyProcessListener; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.xml.*; +import com.arsdigita.bebop.BlockStylable; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.MetaForm; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.form.Hidden; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.parameters.BigDecimalParameter; /** Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/SurveyProcessListener.java 2005-09-02 15:25:32 UTC (rev 757) @@ -22,7 +22,10 @@ import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; -import com.arsdigita.formbuilder.*; +import com.arsdigita.formbuilder.PersistentComponent; +import com.arsdigita.formbuilder.PersistentForm; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; import com.arsdigita.kernel.KernelHelper; import com.arsdigita.domain.DataObjectNotFoundException; @@ -30,7 +33,9 @@ import com.arsdigita.persistence.OID; import java.util.Map; import java.util.HashMap; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.RequestLocal; import com.arsdigita.simplesurvey.Survey; import com.arsdigita.simplesurvey.Response; Modified: ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java =================================================================== --- ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java 2005-09-02 14:26:56 UTC (rev 756) +++ ccm-simplesurvey/trunk/src/com/arsdigita/simplesurvey/ui/admin/AdminPanel.java 2005-09-02 15:25:32 UTC (rev 757) @@ -37,7 +37,9 @@ import com.arsdigita.domain.DomainObjectFactory; -import com.arsdigita.formbuilder.*; +import com.arsdigita.formbuilder.PersistentDate; +import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentWidget; import com.arsdigita.formbuilder.ui.ControlEditor; import com.arsdigita.formbuilder.util.FormBuilderUtil; import com.arsdigita.formbuilder.PersistentLabel; |
