Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
rename and refactor to use interface
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Jul 9, 2012
1 parent ad87064 commit ce080ff
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 23 deletions.
Expand Up @@ -45,7 +45,6 @@
import org.zanata.webtrans.shared.validation.action.NewlineLeadTrailValidation;
import org.zanata.webtrans.shared.validation.action.PrintfVariablesValidation;
import org.zanata.webtrans.shared.validation.action.PrintfXSIExtensionValidation;
import org.zanata.webtrans.shared.validation.action.ValidationAction;
import org.zanata.webtrans.shared.validation.action.XmlEntityValidation;

import com.google.inject.Inject;
Expand All @@ -58,7 +57,7 @@

public class ValidationService
{
private final Map<String, ValidationAction> validationMap = new HashMap<String, ValidationAction>();
private final Map<String, ValidationObject> validationMap = new HashMap<String, ValidationObject>();
private final EventBus eventBus;
private final TableEditorMessages messages;

Expand Down Expand Up @@ -122,7 +121,7 @@ public void execute(String source, String target, boolean fireNotification, Arra

for (String key : validationMap.keySet())
{
ValidationAction action = validationMap.get(key);
ValidationObject action = validationMap.get(key);

if (action != null && action.isEnabled())
{
Expand All @@ -143,7 +142,7 @@ public void execute(String source, String target, boolean fireNotification, Arra
*/
public void updateStatus(String key, boolean isEnabled)
{
ValidationAction action = validationMap.get(key);
ValidationObject action = validationMap.get(key);
action.setEnabled(isEnabled);
// is this put necessary?
validationMap.put(key, action);
Expand All @@ -164,7 +163,7 @@ public void clearAllMessage()
{
for (String key : validationMap.keySet())
{
ValidationAction action = validationMap.get(key);
ValidationObject action = validationMap.get(key);

if (action != null)
{
Expand Down
Expand Up @@ -38,4 +38,10 @@ public interface ValidationObject
boolean hasError();

List<String> getError();

void validate(String source, String target);

void clearErrorMessage();

void setEnabled(boolean isEnabled);
}
Expand Up @@ -33,7 +33,7 @@
* @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
*
**/
public abstract class ValidationAction implements ValidationObject
public abstract class AbstractValidation implements ValidationObject
{
private String id;
private boolean isEnabled;
Expand All @@ -42,13 +42,17 @@ public abstract class ValidationAction implements ValidationObject

private ValidationMessages messages;

protected ValidationMessages getMessages()
private List<String> errorList = new ArrayList<String>();

public AbstractValidation(String id, String description, boolean enabled, final ValidationMessages messages)
{
return messages;
this.id = id;
this.description = description;
this.isEnabled = enabled;
this.messages = messages;
}

private List<String> errorList = new ArrayList<String>();

@Override
public void validate(String source, String target)
{
if (!Strings.isNullOrEmpty(target))
Expand All @@ -57,22 +61,20 @@ public void validate(String source, String target)
}
}

public abstract void doValidate(String source, String target);

public ValidationAction(String id, String description, boolean enabled, final ValidationMessages messages)
protected ValidationMessages getMessages()
{
this.id = id;
this.description = description;
this.isEnabled = enabled;
this.messages = messages;
return messages;
}

protected abstract void doValidate(String source, String target);

@Override
public boolean isEnabled()
{
return isEnabled;
}

@Override
public void setEnabled(boolean isEnabled)
{
this.isEnabled = isEnabled;
Expand Down Expand Up @@ -102,12 +104,13 @@ public List<String> getError()
return errorList;
}

@Override
public void clearErrorMessage()
{
errorList.clear();
}

public void addError(String error)
protected void addError(String error)
{
errorList.add(error);
}
Expand Down
Expand Up @@ -33,7 +33,7 @@
* @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
*
**/
public class HtmlXmlTagValidation extends ValidationAction
public class HtmlXmlTagValidation extends AbstractValidation
{
public HtmlXmlTagValidation(final ValidationMessages messages)
{
Expand Down
Expand Up @@ -36,7 +36,7 @@
* @author David Mason, damason@redhat.com
* @see http://docs.oracle.com/javase/1.4.2/docs/api/java/text/MessageFormat.html
**/
public class JavaVariablesValidation extends ValidationAction
public class JavaVariablesValidation extends AbstractValidation
{
public JavaVariablesValidation(final ValidationMessages messages)
{
Expand Down
Expand Up @@ -30,7 +30,7 @@
* @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
*
**/
public class NewlineLeadTrailValidation extends ValidationAction
public class NewlineLeadTrailValidation extends AbstractValidation
{
public NewlineLeadTrailValidation(final ValidationMessages messages)
{
Expand Down
Expand Up @@ -33,7 +33,7 @@
* @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
*
**/
public class PrintfVariablesValidation extends ValidationAction
public class PrintfVariablesValidation extends AbstractValidation
{

private static final String GLOBAL_FLAG = "g";
Expand Down
Expand Up @@ -35,7 +35,7 @@
* @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
*
**/
public class XmlEntityValidation extends ValidationAction
public class XmlEntityValidation extends AbstractValidation
{

private final static String entityRegex = "&[:a-z_A-Z][a-z_A-Z0-9.-]*;";
Expand Down

0 comments on commit ce080ff

Please sign in to comment.