From a7b07292ddf8610a92522833e6e1e703a7f50b77 Mon Sep 17 00:00:00 2001 From: "Eric J. Bowersox" Date: Sat, 24 Nov 2001 06:44:58 +0000 Subject: [PATCH] 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 --- .../venice/db/PostLinkDecoder.java | 2 +- .../venice/db/PostLinkRewriter.java | 2 +- .../venice/db/UserNameRewriter.java | 2 +- .../venice/servlets/ConfOperations.java | 1 + .../format/CDEmailAddressFormField.java | 2 +- .../servlets/format/CDVeniceIDFormField.java | 2 +- .../venice/servlets/format/RenderData.java | 2 +- .../servlets/format/VerifyEmailDialog.java | 22 ++++++++++++++++++- .../venice/{core => util}/IDUtils.java | 2 +- 9 files changed, 29 insertions(+), 8 deletions(-) rename src/com/silverwrist/venice/{core => util}/IDUtils.java (98%) diff --git a/src/com/silverwrist/venice/db/PostLinkDecoder.java b/src/com/silverwrist/venice/db/PostLinkDecoder.java index 07a002e..7a60e70 100644 --- a/src/com/silverwrist/venice/db/PostLinkDecoder.java +++ b/src/com/silverwrist/venice/db/PostLinkDecoder.java @@ -19,8 +19,8 @@ package com.silverwrist.venice.db; import java.sql.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.core.IDUtils; import com.silverwrist.venice.except.ValidationException; +import com.silverwrist.venice.util.IDUtils; public class PostLinkDecoder { diff --git a/src/com/silverwrist/venice/db/PostLinkRewriter.java b/src/com/silverwrist/venice/db/PostLinkRewriter.java index 758d7be..34774e6 100644 --- a/src/com/silverwrist/venice/db/PostLinkRewriter.java +++ b/src/com/silverwrist/venice/db/PostLinkRewriter.java @@ -22,8 +22,8 @@ import com.silverwrist.util.StringUtil; import com.silverwrist.venice.htmlcheck.Rewriter; import com.silverwrist.venice.htmlcheck.RewriterServices; import com.silverwrist.venice.htmlcheck.MarkupData; -import com.silverwrist.venice.core.IDUtils; import com.silverwrist.venice.except.ValidationException; +import com.silverwrist.venice.util.IDUtils; public class PostLinkRewriter implements Rewriter { diff --git a/src/com/silverwrist/venice/db/UserNameRewriter.java b/src/com/silverwrist/venice/db/UserNameRewriter.java index 408e9e5..6f02077 100644 --- a/src/com/silverwrist/venice/db/UserNameRewriter.java +++ b/src/com/silverwrist/venice/db/UserNameRewriter.java @@ -22,7 +22,7 @@ import com.silverwrist.util.StringUtil; import com.silverwrist.venice.htmlcheck.Rewriter; import com.silverwrist.venice.htmlcheck.RewriterServices; import com.silverwrist.venice.htmlcheck.MarkupData; -import com.silverwrist.venice.core.IDUtils; +import com.silverwrist.venice.util.IDUtils; public class UserNameRewriter implements Rewriter { diff --git a/src/com/silverwrist/venice/servlets/ConfOperations.java b/src/com/silverwrist/venice/servlets/ConfOperations.java index 1de60ac..1c56bad 100644 --- a/src/com/silverwrist/venice/servlets/ConfOperations.java +++ b/src/com/silverwrist/venice/servlets/ConfOperations.java @@ -26,6 +26,7 @@ import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; +import com.silverwrist.venice.util.IDUtils; public class ConfOperations extends VeniceServlet { diff --git a/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java b/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java index f1bd713..0d4881a 100644 --- a/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java @@ -17,8 +17,8 @@ */ package com.silverwrist.venice.servlets.format; -import com.silverwrist.venice.core.IDUtils; import com.silverwrist.venice.except.ValidationException; +import com.silverwrist.venice.util.IDUtils; public class CDEmailAddressFormField extends CDTextFormField { diff --git a/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java b/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java index 88734a1..1d324f7 100644 --- a/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java @@ -17,8 +17,8 @@ */ package com.silverwrist.venice.servlets.format; -import com.silverwrist.venice.core.IDUtils; import com.silverwrist.venice.except.ValidationException; +import com.silverwrist.venice.util.IDUtils; public class CDVeniceIDFormField extends CDTextFormField { diff --git a/src/com/silverwrist/venice/servlets/format/RenderData.java b/src/com/silverwrist/venice/servlets/format/RenderData.java index 53cf78c..d4d565c 100644 --- a/src/com/silverwrist/venice/servlets/format/RenderData.java +++ b/src/com/silverwrist/venice/servlets/format/RenderData.java @@ -26,13 +26,13 @@ import org.apache.log4j.*; import com.silverwrist.util.IOUtil; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.CommunityContext; -import com.silverwrist.venice.core.IDUtils; import com.silverwrist.venice.core.UserContext; import com.silverwrist.venice.core.VeniceEngine; import com.silverwrist.venice.db.PostLinkRewriter; import com.silverwrist.venice.db.UserNameRewriter; import com.silverwrist.venice.except.DataException; import com.silverwrist.venice.servlets.format.menus.LeftMenu; +import com.silverwrist.venice.util.IDUtils; public class RenderData implements ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java b/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java index 5e6091a..82b1ede 100644 --- a/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java +++ b/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java @@ -17,13 +17,23 @@ */ package com.silverwrist.venice.servlets.format; -import com.silverwrist.venice.core.IDUtils; import com.silverwrist.venice.except.*; +import com.silverwrist.venice.util.IDUtils; public class VerifyEmailDialog extends ContentDialog { + /*-------------------------------------------------------------------------------- + * Attributes + *-------------------------------------------------------------------------------- + */ + int confirm_num = 0; + /*-------------------------------------------------------------------------------- + * Constructors + *-------------------------------------------------------------------------------- + */ + public VerifyEmailDialog() { super("Verify E-mail Address",null,"verifyform","account"); @@ -46,6 +56,11 @@ public class VerifyEmailDialog extends ContentDialog } // end constructor + /*-------------------------------------------------------------------------------- + * Overrides from class ContentDialog + *-------------------------------------------------------------------------------- + */ + protected void validateWholeForm() throws ValidationException { try @@ -66,6 +81,11 @@ public class VerifyEmailDialog extends ContentDialog } // end validateWholeForm + /*-------------------------------------------------------------------------------- + * External operations + *-------------------------------------------------------------------------------- + */ + public void setTarget(String target) { setHiddenField("tgt",target); diff --git a/src/com/silverwrist/venice/core/IDUtils.java b/src/com/silverwrist/venice/util/IDUtils.java similarity index 98% rename from src/com/silverwrist/venice/core/IDUtils.java rename to src/com/silverwrist/venice/util/IDUtils.java index f9072f7..7bd7242 100644 --- a/src/com/silverwrist/venice/core/IDUtils.java +++ b/src/com/silverwrist/venice/util/IDUtils.java @@ -15,7 +15,7 @@ * * Contributor(s): */ -package com.silverwrist.venice.core; +package com.silverwrist.venice.util; import javax.mail.internet.InternetAddress; import javax.mail.internet.AddressException;