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

Commit

Permalink
strip trailing whitespace and tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidmason
davidmason committed Jul 16, 2013
1 parent 6b3899d commit de43f0c
Show file tree
Hide file tree
Showing 20 changed files with 186 additions and 194 deletions.
6 changes: 3 additions & 3 deletions ...ional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
View file
Expand Up @@ -133,16 +133,16 @@ public ManageLanguageTeamMemberPage addToTeam(TableRow personRow)
log.info("username to be added: {}", personUsername);
WebElement selectRowToUpdateCell = personRow.getCells().get(SEARCH_RESULT_SELECTED_COLUMN).findElement(By.tagName("input"));
WebElement isTranslatorCell = personRow.getCells().get(ISTRANSLATOR_COLUMN).findElement(By.tagName("input"));

if (!isTranslatorCell.isSelected())
{
if(!selectRowToUpdateCell.isSelected())
{
selectRowToUpdateCell.click();
}

isTranslatorCell.click();

WebElement addButton = getDriver().findElement(By.id("resultForm:addSelectedBtn"));
addButton.click();
WebElement closeButton = getDriver().findElement(By.id("searchForm:closeBtn"));
Expand Down
2 changes: 1 addition & 1 deletion functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
View file
Expand Up @@ -44,7 +44,7 @@ public void addLanguageAndJoin(String localeId)
log.warn("admin has already joined the language [{}]", localeId);
}
}

public ManageLanguagePage addLanguage(String localeId)
{
ManageLanguagePage manageLanguagePage = goToHome().goToAdministration().goToManageLanguagePage();
Expand Down
2 changes: 1 addition & 1 deletion functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
View file
Expand Up @@ -49,7 +49,7 @@ public void changeAUsersUsername()
{
String username = "administratornamechange";
ManageUserPage manageUserPage = homePage.goToAdministration().goToManageUserPage();

ManageUserAccountPage manageUserAccountPage = manageUserPage.editUserAccount("admin");
manageUserPage = manageUserAccountPage.clearAndEnterUsername(username).saveUser();
assertThat("Administrator is displayed", manageUserPage.getUserList(), Matchers.hasItem(username));
Expand Down
2 changes: 1 addition & 1 deletion functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
View file
Expand Up @@ -67,7 +67,7 @@ public ManageUserPage changeUsernameAndPassword(ManageUserAccountPage manageUser
.clearAndEnterPassword(newPassword)
.clearAndEnterConfirmPassword(newPassword)
.saveUser();

return page;
}

Expand Down
16 changes: 7 additions & 9 deletions zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
View file
Expand Up @@ -50,15 +50,13 @@
public class HLocaleMember implements Serializable
{
private static final long serialVersionUID = 1L;

private HLocaleMemberPk id = new HLocaleMemberPk();

private boolean isCoordinator;

private boolean isReviewer;

private boolean isTranslator;

public HLocaleMember( HPerson person, HLocale supportedLanguage, boolean isTranslator, boolean isReviewer, boolean isCoordinator)
{
id.setPerson(person);
Expand All @@ -67,13 +65,13 @@ public HLocaleMember( HPerson person, HLocale supportedLanguage, boolean isTrans
setReviewer(isReviewer);
setCoordinator(isCoordinator);
}

@EmbeddedId
protected HLocaleMemberPk getId()
{
return id;
}

protected void setId(HLocaleMemberPk id)
{
this.id = id;
Expand All @@ -84,13 +82,13 @@ public boolean isCoordinator()
{
return isCoordinator;
}

@Column(name="isReviewer")
public boolean isReviewer()
{
return isReviewer;
}

@Column(name="isTranslator")
public boolean isTranslator()
{
Expand Down
46 changes: 23 additions & 23 deletions zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
View file
Expand Up @@ -52,28 +52,28 @@
public class LanguageTeamAction implements Serializable
{
private static final long serialVersionUID = 1L;

@In
private LanguageTeamService languageTeamServiceImpl;

@In
private LocaleDAO localeDAO;

@In
private LocaleMemberDAO localeMemberDAO;

@In
private PersonDAO personDAO;

@In
private LocaleService localeServiceImpl;

@In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER)
HAccount authenticatedAccount;

@Logger
Log log;

private String language;
private String searchTerm;
private List<SelectablePerson> searchResults;
Expand All @@ -88,7 +88,7 @@ public void setLanguage(String language)
{
this.language = language;
}

public String getSearchTerm()
{
return searchTerm;
Expand All @@ -105,15 +105,15 @@ public List<SelectablePerson> getSearchResults()
{
searchResults = new ArrayList<SelectablePerson>();
}

return searchResults;
}

public boolean isUserInTeam()
{
return authenticatedAccount != null && this.isPersonInTeam( this.authenticatedAccount.getId() );
}

public void selectAll()
{
for (SelectablePerson selectablePerson : getSearchResults())
Expand All @@ -124,7 +124,7 @@ public void selectAll()
}
}
}

@Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
public void addSelected()
{
Expand Down Expand Up @@ -197,7 +197,7 @@ public void leaveTribe()
log.info("{0} left tribe {1}", authenticatedAccount.getUsername(), this.language);
FacesMessages.instance().add("You have left the {0} language team", getLocale().retrieveNativeName());
}

@Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
public void saveTeamCoordinator( HLocaleMember member )
{
Expand All @@ -212,7 +212,7 @@ public void saveTeamCoordinator( HLocaleMember member )
FacesMessages.instance().add("{0} has been removed from as Team Coordinators", member.getPerson().getAccount().getUsername());
}
}

@Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
public void saveTeamReviewer( HLocaleMember member )
{
Expand All @@ -227,7 +227,7 @@ public void saveTeamReviewer( HLocaleMember member )
FacesMessages.instance().add("{0} has been removed from as Team Reviewer", member.getPerson().getAccount().getUsername());
}
}

@Restrict("#{s:hasPermission(languageTeamAction.locale, 'manage-language-team')}")
public void saveTeamTranslator( HLocaleMember member )
{
Expand All @@ -253,7 +253,7 @@ public void removeMembership( HLocaleMember member )
{
this.languageTeamServiceImpl.leaveLanguageTeam(this.language, member.getPerson().getId());
}

public boolean isPersonInTeam( final Long personId )
{
for( HLocaleMember lm : getLocale().getMembers() )
Expand All @@ -265,7 +265,7 @@ public boolean isPersonInTeam( final Long personId )
}
return false;
}

private HLocaleMember getLocaleMember( final Long personId )
{
for( HLocaleMember lm : getLocale().getMembers() )
Expand All @@ -277,7 +277,7 @@ private HLocaleMember getLocaleMember( final Long personId )
}
return null;
}

public void searchForTeamMembers()
{
getSearchResults().clear();
Expand All @@ -299,7 +299,7 @@ public void searchForTeamMembers()
getSearchResults().add(new SelectablePerson(person, isMember, isTranslator, isReviewer, isCoordinator));
}
}

public boolean isSelectAll()
{
return selectAll;
Expand All @@ -309,16 +309,16 @@ public void setSelectAll(boolean selectAll)
{
this.selectAll = selectAll;
}

public final class SelectablePerson
{
private HPerson person;
private boolean selected;

private boolean isReviewer;
private boolean isCoordinator;
private boolean isTranslator;

public SelectablePerson(HPerson person, boolean selected, boolean isTranslator, boolean isReviewer, boolean isCoordinator)
{
this.person = person;
Expand Down Expand Up @@ -357,7 +357,7 @@ public void setTranslator(boolean isTranslator)
{
this.isTranslator = isTranslator;
}

public HPerson getPerson()
{
return person;
Expand All @@ -375,5 +375,5 @@ public void setSelected(boolean selected)
this.selected = selected;
}
}

}
10 changes: 5 additions & 5 deletions zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
View file
Expand Up @@ -93,7 +93,7 @@ public HPerson findByUsername(String username)
query.setComment("PersonDAO.findByUsername");
return (HPerson) query.uniqueResult();
}

public String findEmail(String username)
{
Query query = getSession().createQuery("select p.email from HPerson as p where p.account.username = :username");
Expand Down Expand Up @@ -143,7 +143,7 @@ public boolean isUserInLanguageTeamWithRoles(HPerson person, HLocale language, B
sb.append("select count(*) from HLocaleMember where ");
sb.append("id.person = :person ");
sb.append("and id.supportedLanguage = :language ");

if(isTranslator != null)
{
sb.append("and translator = :isTranslator ");
Expand All @@ -156,11 +156,11 @@ public boolean isUserInLanguageTeamWithRoles(HPerson person, HLocale language, B
{
sb.append("and coordinator = :isCoordinator ");
}

Query q = getSession().createQuery(sb.toString().trim())
.setParameter("person", person)
.setParameter("language", language);

if(isTranslator != null)
{
q.setParameter("isTranslator", isTranslator.booleanValue());
Expand All @@ -173,7 +173,7 @@ public boolean isUserInLanguageTeamWithRoles(HPerson person, HLocale language, B
{
q.setParameter("isCoordinator", isCoordinator.booleanValue());
}

q.setCacheable(false).setComment("PersonDAO.isUserInLanguageTeamWithRoles");
Long totalCount = (Long) q.uniqueResult();
return totalCount > 0L;
Expand Down
8 changes: 4 additions & 4 deletions zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
View file
Expand Up @@ -598,16 +598,16 @@ public void onWorkspaceContextUpdated(WorkspaceContextUpdateEvent event)
// FIXME once setting codemirror editor to readonly it won't be editable again
userWorkspaceContext.setProjectActive(event.isProjectActive());
userWorkspaceContext.getWorkspaceContext().getWorkspaceId().getProjectIterationId().setProjectType(event.getProjectType());

for (TargetContentsDisplay targetContentsDisplay : displayList)
{
ViewMode viewMode = canEditTranslation() ? ViewMode.EDIT : ViewMode.VIEW;
boolean showButtons = userWorkspaceContext.hasReadOnlyAccess() ? false : isDisplayButtons();

targetContentsDisplay.setToMode(viewMode);
targetContentsDisplay.showButtons(showButtons);
}

if (userWorkspaceContext.hasReadOnlyAccess())
{
concealDisplay();
Expand Down Expand Up @@ -673,7 +673,7 @@ public boolean canReview()
WorkspaceRestrictions restrictions = userWorkspaceContext.getWorkspaceRestrictions();
return restrictions.isHasReviewAccess() && restrictions.isProjectRequireReview();
}

@Override
public boolean canEditTranslation()
{
Expand Down
5 changes: 2 additions & 3 deletions zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
View file
Expand Up @@ -67,7 +67,7 @@ public class UpdateTransUnitHandler extends AbstractActionHandler<UpdateTransUni
public UpdateTransUnitResult execute(UpdateTransUnit action, ExecutionContext context) throws ActionException
{
SecurityService.SecurityCheckResult securityCheckResult;

if(action.getUpdateType() == UpdateType.WebEditorSaveReview)
{
securityCheckResult = securityServiceImpl.checkPermission(action, SecurityService.TranslationAction.REVIEW);
Expand All @@ -76,8 +76,7 @@ public UpdateTransUnitResult execute(UpdateTransUnit action, ExecutionContext co
{
securityCheckResult = securityServiceImpl.checkPermission(action, SecurityService.TranslationAction.MODIFY);
}



HLocale hLocale = securityCheckResult.getLocale();
TranslationWorkspace workspace = securityCheckResult.getWorkspace();

Expand Down
4 changes: 2 additions & 2 deletions zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
View file
Expand Up @@ -30,7 +30,7 @@ public void setHasEditTranslationAccess(boolean hasEditTranslationAccess)
{
workspaceRestrictions = workspaceRestrictions.changeEditTranslationAccess(hasEditTranslationAccess);
}

public void setHasReviewAccess(boolean hasReviewAccess)
{
workspaceRestrictions = workspaceRestrictions.changeReviewAccess(hasReviewAccess);
Expand All @@ -45,7 +45,7 @@ public boolean hasReadOnlyAccess()
{
return (!getWorkspaceRestrictions().isProjectActive() || (!getWorkspaceRestrictions().isHasEditTranslationAccess() && !getWorkspaceRestrictions().isHasReviewAccess()));
}

public boolean hasEditTranslationAccess()
{
return (getWorkspaceRestrictions().isProjectActive() && getWorkspaceRestrictions().isHasEditTranslationAccess());
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
View file
Expand Up @@ -62,7 +62,7 @@ public WorkspaceRestrictions changeEditTranslationAccess(boolean hasEditTranslat
{
return new WorkspaceRestrictions(isProjectActive, hasEditTranslationAccess, hasGlossaryUpdateAccess, hasReviewAccess, projectRequireReview);
}

public WorkspaceRestrictions changeReviewAccess(boolean hasReviewAccess)
{
return new WorkspaceRestrictions(isProjectActive, hasEditTranslationAccess, hasGlossaryUpdateAccess, hasReviewAccess, projectRequireReview);
Expand Down

0 comments on commit de43f0c

Please sign in to comment.