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

Commit

Permalink
rename searchText to edtiroTextSearch in HistoryToken
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Apr 30, 2014
1 parent c0e0972 commit f642718
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 39 deletions.
4 changes: 2 additions & 2 deletions zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
View file
Expand Up @@ -32,7 +32,7 @@ public void populateHistoryToken(HistoryToken historyToken, Token token) {
if (key.equals(EditorTokens.KEY_DOCUMENT)) {
historyToken.setDocumentPath(value);
} else if (key.equals(EditorTokens.KEY_SEARCH_DOC_TEXT)) {
historyToken.setSearchText(value);
historyToken.setEditorTextSearch(value);
} else if (key.equals(EditorTokens.KEY_TEXT_FLOW_ID)) {
historyToken.setTextFlowId(value);
}
Expand Down Expand Up @@ -84,7 +84,7 @@ public void toTokenString(HistoryToken historyToken, List<Token> tokens) {
tokens.add(new Token(KEY_DOCUMENT, historyToken.getDocumentPath()));
}

setIfExists(tokens, KEY_SEARCH_DOC_TEXT, historyToken.getSearchText());
setIfExists(tokens, KEY_SEARCH_DOC_TEXT, historyToken.getEditorTextSearch());

if (historyToken.getTextFlowId() != null) {
tokens.add(new Token(KEY_TEXT_FLOW_ID, historyToken.getTextFlowId()
Expand Down
13 changes: 6 additions & 7 deletions zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
View file
Expand Up @@ -42,8 +42,7 @@ public class HistoryToken {
private boolean docFilterExact;
private boolean docFilterCaseSensitive;
private String docFilterText;
// TODO pahuang rename to editorTextSearch
private String searchText;
private String editorTextSearch;
private String resId;
private String lastModifiedBy;
private String changedBefore;
Expand Down Expand Up @@ -123,12 +122,12 @@ public void setProjectSearchInTarget(boolean searchInTarget) {
projectSearchInTarget = searchInTarget;
}

public String getSearchText() {
return this.searchText;
public String getEditorTextSearch() {
return this.editorTextSearch;
}

public void setSearchText(String value) {
this.searchText = Strings.isNullOrEmpty(value) ? DEFAULT_SEARCH_TEXT : value;
public void setEditorTextSearch(String value) {
this.editorTextSearch = Strings.isNullOrEmpty(value) ? DEFAULT_SEARCH_TEXT : value;
}

public String getProjectSearchText() {
Expand Down Expand Up @@ -350,7 +349,7 @@ public void clearEditorFilterAndSearch() {
filterUntranslated = false;
filterApproved = false;
filterRejected = false;
searchText = null;
editorTextSearch = null;
resId = null;
changedBefore = null;
changedAfter = null;
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
View file
Expand Up @@ -213,7 +213,7 @@ public void fireDocumentSelection(DocumentInfo doc) {
}

// don't carry searches over to the next document
token.setSearchText("");
token.setEditorTextSearch("");
history.newItem(token);

userWorkspaceContext.setSelectedDoc(doc);
Expand Down
4 changes: 2 additions & 2 deletions zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
View file
Expand Up @@ -491,9 +491,9 @@ private void showDocInEditor(String doc, boolean runSearch) {
token.clearEditorFilterAndSearch();
token.setView(MainView.Editor);
if (runSearch) {
token.setSearchText(token.getProjectSearchText());
token.setEditorTextSearch(token.getProjectSearchText());
} else {
token.setSearchText("");
token.setEditorTextSearch("");
}
history.newItem(token);
}
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
View file
Expand Up @@ -73,7 +73,7 @@ public boolean isFocused() {
@Override
public void searchTerm(String searchTerm) {
HistoryToken newToken = history.getHistoryToken();
newToken.setSearchText(searchTerm);
newToken.setEditorTextSearch(searchTerm);
history.newItem(newToken);
}

Expand Down
8 changes: 4 additions & 4 deletions zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
View file
Expand Up @@ -83,7 +83,7 @@ public void onValueChange(ValueChangeEvent<String> event) {
documentListPresenter.getDocumentId(newHistoryToken
.getDocumentPath());
EditorFilter editorFilter =
new EditorFilter(newHistoryToken.getSearchText(),
new EditorFilter(newHistoryToken.getEditorTextSearch(),
newHistoryToken.getResId(),
newHistoryToken.getChangedBefore(),
newHistoryToken.getChangedAfter(),
Expand Down Expand Up @@ -145,12 +145,12 @@ protected void processForAppPresenter(DocumentId docId) {

protected void processForTransFilter(HistoryToken newHistoryToken) {
boolean findMessageChanged =
!Objects.equal(newHistoryToken.getSearchText(),
currentHistoryState.getSearchText());
!Objects.equal(newHistoryToken.getEditorTextSearch(),
currentHistoryState.getEditorTextSearch());
if (findMessageChanged) {
Log.info("[gwt-history] trans filter search has changed");
eventBus.fireEvent(new FindMessageEvent(newHistoryToken
.getSearchText()));
.getEditorTextSearch()));
}
}

Expand Down
36 changes: 18 additions & 18 deletions zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
View file
Expand Up @@ -35,7 +35,7 @@ public void constructionSetsDefaults() {
assertFalse("default document filter exact match flag should be false",
token.getDocFilterExact());
assertThat("default search text should be null",
token.getSearchText(), Matchers.nullValue());
token.getEditorTextSearch(), Matchers.nullValue());
assertEquals(
"default project-wide search text should be an empty string",
"", token.getProjectSearchText());
Expand Down Expand Up @@ -67,7 +67,7 @@ public void fromEmptyStringSetsDefaults() {
assertFalse("default document filter exact match flag should be false",
token.getDocFilterExact());
assertThat("default search text should be null",
token.getSearchText(), Matchers.nullValue());
token.getEditorTextSearch(), Matchers.nullValue());
assertEquals(
"default project-wide search text should be an empty string",
"", token.getProjectSearchText());
Expand Down Expand Up @@ -99,7 +99,7 @@ public void fromNullStringSetsDefaults() {
assertFalse("default document filter exact match flag should be false",
token.getDocFilterExact());
assertThat("default search text should be null",
token.getSearchText(), Matchers.nullValue());
token.getEditorTextSearch(), Matchers.nullValue());
assertEquals(
"default project-wide search text should be an empty string",
"", token.getProjectSearchText());
Expand Down Expand Up @@ -144,7 +144,7 @@ public void fromTokenStringSetsSearchValues() {
token = HistoryToken.fromTokenString(tokenString);

assertEquals("search text should be set from token string",
"searchtext", token.getSearchText());
"searchtext", token.getEditorTextSearch());
assertEquals(
"project-wide search text should be set from token string",
"projectsearchtext", token.getProjectSearchText());
Expand Down Expand Up @@ -185,7 +185,7 @@ public void fromTokenStringParameterOrderIrrelevant2() {

assertEquals(
"search text should be set from any position in token string",
"searchtext", token.getSearchText());
"searchtext", token.getEditorTextSearch());
assertEquals(
"project-wide search text should be set from any position in token string",
"projectsearchtext", token.getProjectSearchText());
Expand Down Expand Up @@ -231,7 +231,7 @@ public void fromTokenStringUnknownTokenKeysIgnored() {
token.getDocFilterText());
assertFalse("unknown keys should be ignored", token.getDocFilterExact());
assertThat("unknown keys should be ignored",
token.getSearchText(), Matchers.nullValue());
token.getEditorTextSearch(), Matchers.nullValue());
assertEquals("unknown keys should be ignored", "",
token.getProjectSearchText());
assertEquals("unknown keys should be ignored", "",
Expand Down Expand Up @@ -303,17 +303,17 @@ public void getSetFilterFlag() {
@Test
public void getSetSearchText() {
token = new HistoryToken();
token.setSearchText("some search text");
assertEquals("some search text", token.getSearchText());
token.setSearchText(null);
token.setEditorTextSearch("some search text");
assertEquals("some search text", token.getEditorTextSearch());
token.setEditorTextSearch(null);
assertThat(
"search text should be returned null after setting to null",
token.getSearchText(), Matchers.nullValue());
token.getEditorTextSearch(), Matchers.nullValue());

token.setSearchText("text to be discarded");
token.setSearchText("");
token.setEditorTextSearch("text to be discarded");
token.setEditorTextSearch("");
assertThat("empty search text is treated as null",
token.getSearchText(), Matchers.nullValue());
token.getEditorTextSearch(), Matchers.nullValue());
}

@Test
Expand Down Expand Up @@ -396,7 +396,7 @@ public void toTokenStringHasCustomValues() {
token.setDocumentPath("some/document");
token.setDocFilterText("myfilter");
token.setDocFilterExact(true);
token.setSearchText("searchtext");
token.setEditorTextSearch("searchtext");
token.setProjectSearchText("projectsearchtext");
token.setProjectSearchReplacement("replacementtext");
token.setProjectSearchCaseSensitive(true);
Expand All @@ -421,7 +421,7 @@ public void tokenStringRoundTrip() {
token.setDocumentPath("some/document");
token.setDocFilterText("myfilter");
token.setDocFilterExact(true);
token.setSearchText("searchtext");
token.setEditorTextSearch("searchtext");
token.setProjectSearchText("projectsearchtext");
token.setProjectSearchReplacement("replacementtext");
token.setProjectSearchCaseSensitive(true);
Expand All @@ -445,7 +445,7 @@ public void tokenStringRoundTrip() {
token.getDocFilterExact());
assertEquals(
"search text should survive a round-trip to and from token string",
"searchtext", token.getSearchText());
"searchtext", token.getEditorTextSearch());
assertEquals(
"project-wide search text should survive a round-trip to and from token string",
"projectsearchtext", token.getProjectSearchText());
Expand All @@ -462,7 +462,7 @@ public void tokenStringRoundTripWithEncodedCharacters() {
token = new HistoryToken();
token.setDocumentPath("some:document;with!encodedchars");
token.setDocFilterText("my!fil:ter;");
token.setSearchText(":search!text;");
token.setEditorTextSearch(":search!text;");
token.setProjectSearchText("project:search;text!");
token.setProjectSearchReplacement("re!place;ment:text");

Expand All @@ -479,7 +479,7 @@ public void tokenStringRoundTripWithEncodedCharacters() {
"my!fil:ter;", token.getDocFilterText());
assertEquals(
"encodable characters in search text should survive a round-trip to and from token string",
":search!text;", token.getSearchText());
":search!text;", token.getEditorTextSearch());
assertEquals(
"encodable characters in project-wide search text should survive a round-trip to and from token string",
"project:search;text!", token.getProjectSearchText());
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
View file
Expand Up @@ -74,7 +74,7 @@ public void testSearchTerm() throws Exception {

presenter.searchTerm("blah");

assertThat(historyToken.getSearchText(), Matchers.equalTo("blah"));
assertThat(historyToken.getEditorTextSearch(), Matchers.equalTo("blah"));
verify(history).newItem(historyToken);
}

Expand Down
6 changes: 3 additions & 3 deletions ...-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java
View file
Expand Up @@ -134,7 +134,7 @@ public void onProcessTransFilterWillDoNothingIfHistoryNotChanged() {
@Test
public void onProcessTransFilter() {
HistoryToken token = new HistoryToken();
token.setSearchText("something");
token.setEditorTextSearch("something");

service.processForTransFilter(token);

Expand Down Expand Up @@ -195,7 +195,7 @@ public void processHistoryTokenWithInitializedContext() {
// Given: history token contains everything and editor context is loaded
HistoryToken token = new HistoryToken();
token.setDocFilterText("doc filter test");
token.setSearchText("search text");
token.setEditorTextSearch("search text");
token.setProjectSearchText("project search text");
token.setDocumentPath("doc/path");
token.setProjectSearchReplacement("replacement");
Expand Down Expand Up @@ -248,7 +248,7 @@ public void processHistoryTokenForUninitializedContext() {
// initialized
HistoryToken token = new HistoryToken();
token.setDocFilterText("doc filter test");
token.setSearchText("search text");
token.setEditorTextSearch("search text");
token.setProjectSearchText("project search text");
token.setDocumentPath("doc/path");
token.setProjectSearchReplacement("replacement");
Expand Down

0 comments on commit f642718

Please sign in to comment.