moved IDUtils to the utils package and out of the core package - this pretty
well finishes the cleanup of the core package, getting all the cruft out
This commit is contained in:
parent
4e251e72e1
commit
a7b07292dd
|
@ -19,8 +19,8 @@ package com.silverwrist.venice.db;
|
||||||
|
|
||||||
import java.sql.*;
|
import java.sql.*;
|
||||||
import com.silverwrist.util.StringUtil;
|
import com.silverwrist.util.StringUtil;
|
||||||
import com.silverwrist.venice.core.IDUtils;
|
|
||||||
import com.silverwrist.venice.except.ValidationException;
|
import com.silverwrist.venice.except.ValidationException;
|
||||||
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class PostLinkDecoder
|
public class PostLinkDecoder
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,8 +22,8 @@ import com.silverwrist.util.StringUtil;
|
||||||
import com.silverwrist.venice.htmlcheck.Rewriter;
|
import com.silverwrist.venice.htmlcheck.Rewriter;
|
||||||
import com.silverwrist.venice.htmlcheck.RewriterServices;
|
import com.silverwrist.venice.htmlcheck.RewriterServices;
|
||||||
import com.silverwrist.venice.htmlcheck.MarkupData;
|
import com.silverwrist.venice.htmlcheck.MarkupData;
|
||||||
import com.silverwrist.venice.core.IDUtils;
|
|
||||||
import com.silverwrist.venice.except.ValidationException;
|
import com.silverwrist.venice.except.ValidationException;
|
||||||
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class PostLinkRewriter implements Rewriter
|
public class PostLinkRewriter implements Rewriter
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,7 +22,7 @@ import com.silverwrist.util.StringUtil;
|
||||||
import com.silverwrist.venice.htmlcheck.Rewriter;
|
import com.silverwrist.venice.htmlcheck.Rewriter;
|
||||||
import com.silverwrist.venice.htmlcheck.RewriterServices;
|
import com.silverwrist.venice.htmlcheck.RewriterServices;
|
||||||
import com.silverwrist.venice.htmlcheck.MarkupData;
|
import com.silverwrist.venice.htmlcheck.MarkupData;
|
||||||
import com.silverwrist.venice.core.IDUtils;
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class UserNameRewriter implements Rewriter
|
public class UserNameRewriter implements Rewriter
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,6 +26,7 @@ import com.silverwrist.util.StringUtil;
|
||||||
import com.silverwrist.venice.core.*;
|
import com.silverwrist.venice.core.*;
|
||||||
import com.silverwrist.venice.except.*;
|
import com.silverwrist.venice.except.*;
|
||||||
import com.silverwrist.venice.servlets.format.*;
|
import com.silverwrist.venice.servlets.format.*;
|
||||||
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class ConfOperations extends VeniceServlet
|
public class ConfOperations extends VeniceServlet
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
*/
|
*/
|
||||||
package com.silverwrist.venice.servlets.format;
|
package com.silverwrist.venice.servlets.format;
|
||||||
|
|
||||||
import com.silverwrist.venice.core.IDUtils;
|
|
||||||
import com.silverwrist.venice.except.ValidationException;
|
import com.silverwrist.venice.except.ValidationException;
|
||||||
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class CDEmailAddressFormField extends CDTextFormField
|
public class CDEmailAddressFormField extends CDTextFormField
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
*/
|
*/
|
||||||
package com.silverwrist.venice.servlets.format;
|
package com.silverwrist.venice.servlets.format;
|
||||||
|
|
||||||
import com.silverwrist.venice.core.IDUtils;
|
|
||||||
import com.silverwrist.venice.except.ValidationException;
|
import com.silverwrist.venice.except.ValidationException;
|
||||||
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class CDVeniceIDFormField extends CDTextFormField
|
public class CDVeniceIDFormField extends CDTextFormField
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,13 +26,13 @@ import org.apache.log4j.*;
|
||||||
import com.silverwrist.util.IOUtil;
|
import com.silverwrist.util.IOUtil;
|
||||||
import com.silverwrist.util.StringUtil;
|
import com.silverwrist.util.StringUtil;
|
||||||
import com.silverwrist.venice.core.CommunityContext;
|
import com.silverwrist.venice.core.CommunityContext;
|
||||||
import com.silverwrist.venice.core.IDUtils;
|
|
||||||
import com.silverwrist.venice.core.UserContext;
|
import com.silverwrist.venice.core.UserContext;
|
||||||
import com.silverwrist.venice.core.VeniceEngine;
|
import com.silverwrist.venice.core.VeniceEngine;
|
||||||
import com.silverwrist.venice.db.PostLinkRewriter;
|
import com.silverwrist.venice.db.PostLinkRewriter;
|
||||||
import com.silverwrist.venice.db.UserNameRewriter;
|
import com.silverwrist.venice.db.UserNameRewriter;
|
||||||
import com.silverwrist.venice.except.DataException;
|
import com.silverwrist.venice.except.DataException;
|
||||||
import com.silverwrist.venice.servlets.format.menus.LeftMenu;
|
import com.silverwrist.venice.servlets.format.menus.LeftMenu;
|
||||||
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class RenderData implements ColorSelectors
|
public class RenderData implements ColorSelectors
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,13 +17,23 @@
|
||||||
*/
|
*/
|
||||||
package com.silverwrist.venice.servlets.format;
|
package com.silverwrist.venice.servlets.format;
|
||||||
|
|
||||||
import com.silverwrist.venice.core.IDUtils;
|
|
||||||
import com.silverwrist.venice.except.*;
|
import com.silverwrist.venice.except.*;
|
||||||
|
import com.silverwrist.venice.util.IDUtils;
|
||||||
|
|
||||||
public class VerifyEmailDialog extends ContentDialog
|
public class VerifyEmailDialog extends ContentDialog
|
||||||
{
|
{
|
||||||
|
/*--------------------------------------------------------------------------------
|
||||||
|
* Attributes
|
||||||
|
*--------------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
int confirm_num = 0;
|
int confirm_num = 0;
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------------------
|
||||||
|
* Constructors
|
||||||
|
*--------------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
public VerifyEmailDialog()
|
public VerifyEmailDialog()
|
||||||
{
|
{
|
||||||
super("Verify E-mail Address",null,"verifyform","account");
|
super("Verify E-mail Address",null,"verifyform","account");
|
||||||
|
@ -46,6 +56,11 @@ public class VerifyEmailDialog extends ContentDialog
|
||||||
|
|
||||||
} // end constructor
|
} // end constructor
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------------------
|
||||||
|
* Overrides from class ContentDialog
|
||||||
|
*--------------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
protected void validateWholeForm() throws ValidationException
|
protected void validateWholeForm() throws ValidationException
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -66,6 +81,11 @@ public class VerifyEmailDialog extends ContentDialog
|
||||||
|
|
||||||
} // end validateWholeForm
|
} // end validateWholeForm
|
||||||
|
|
||||||
|
/*--------------------------------------------------------------------------------
|
||||||
|
* External operations
|
||||||
|
*--------------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
public void setTarget(String target)
|
public void setTarget(String target)
|
||||||
{
|
{
|
||||||
setHiddenField("tgt",target);
|
setHiddenField("tgt",target);
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
*
|
*
|
||||||
* Contributor(s):
|
* Contributor(s):
|
||||||
*/
|
*/
|
||||||
package com.silverwrist.venice.core;
|
package com.silverwrist.venice.util;
|
||||||
|
|
||||||
import javax.mail.internet.InternetAddress;
|
import javax.mail.internet.InternetAddress;
|
||||||
import javax.mail.internet.AddressException;
|
import javax.mail.internet.AddressException;
|
Loading…
Reference in New Issue
Block a user