Merge pull request #270 from zanata/rhbz1026155

rhbz1026155 - fix NPE

zanata-war/src/main/java/org/zanata/action/ProjectHome.java

@@ -27,14 +27,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.faces.event.ValueChangeEvent;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityNotFoundException;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.Session;
 import org.hibernate.criterion.NaturalIdentifier;
@@ -46,9 +42,6 @@
 import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.security.management.JpaIdentityStore;
 import org.zanata.common.EntityStatus;
-import org.zanata.dao.LocaleDAO;
-import org.zanata.dao.PersonDAO;
-import org.zanata.dao.ProjectDAO;
 import org.zanata.dao.ProjectIterationDAO;
 import org.zanata.model.HAccount;
 import org.zanata.model.HAccountRole;
@@ -58,8 +51,9 @@
 import org.zanata.security.ZanataIdentity;
 import org.zanata.service.LocaleService;
 import org.zanata.service.SlugEntityService;
-import org.zanata.service.ValidationService;
 import org.zanata.webtrans.shared.model.ValidationAction;
+import lombok.Getter;
+import lombok.Setter;
 
 @Name("projectHome")
 public class ProjectHome extends SlugHome<HProject> {
@@ -74,15 +68,6 @@ public class ProjectHome extends SlugHome<HProject> {
     @In
     ZanataIdentity identity;
 
-    @In
-    private PersonDAO personDAO;
-
-    @In
-    private LocaleDAO localeDAO;
-
-    @In
-    private ValidationService validationServiceImpl;
-
     @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER)
     HAccount authenticatedAccount;
 
@@ -112,9 +97,6 @@ public class ProjectHome extends SlugHome<HProject> {
     @In
     private SlugEntityService slugEntityServiceImpl;
 
-    @In(create = true)
-    private ProjectDAO projectDAO;
-
     @In
     private ProjectIterationDAO projectIterationDAO;
 
@@ -309,10 +291,13 @@ private void updateOverrideLocales() {
     }
 
     private void updateOverrideValidations() {
-        getInstance().getCustomizedValidations().clear();
-        for (ValidationAction action : customizedValidations) {
-            getInstance().getCustomizedValidations().put(action.getId().name(),
-                    action.getState().name());
+        // edit project page code won't have customized validations outjected
+        if (customizedValidations != null) {
+            getInstance().getCustomizedValidations().clear();
+            for (ValidationAction action : customizedValidations) {
+                getInstance().getCustomizedValidations().put(
+                    action.getId().name(), action.getState().name());
+            }
         }
     }