From 8eff6bcbddedc2914593be4b87ab8f59a48b7860 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 4 Apr 2013 10:43:58 +1000 Subject: [PATCH] Refactor documentInfo model --- .../zanata/webtrans/client/Application.java | 2 +- .../presenter/DocumentListPresenter.java | 32 +++++---- .../webtrans/client/ui/DocumentListTable.java | 30 ++++---- .../client/view/DocumentListDisplay.java | 6 +- .../client/view/DocumentListView.java | 6 +- .../server/rpc/GetDocumentListHandler.java | 3 +- .../webtrans/shared/model/AuditInfo.java | 69 +++++++++++++++++++ .../webtrans/shared/model/DocumentInfo.java | 42 +++-------- .../client/presenter/AppPresenterTest.java | 9 +-- .../presenter/DocumentListPresenterTest.java | 13 ++-- .../presenter/GlossaryPresenterTest.java | 13 ++-- .../presenter/PathDocumentFilterTest.java | 3 +- .../presenter/TransMemoryPresenterTest.java | 13 ++-- .../rpc/DummyActivateWorkspaceCommand.java | 3 +- .../client/rpc/DummyGetDocsListCommand.java | 21 +++--- 15 files changed, 165 insertions(+), 100 deletions(-) create mode 100644 zanata-war/src/main/java/org/zanata/webtrans/shared/model/AuditInfo.java diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java b/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java index fac5e49933..53bf79ccd2 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java @@ -198,7 +198,7 @@ public void onSuccess(GetDocumentListResult result) exceptionHandler.setAppPresenter(appPresenter); exceptionHandler.setTargetContentsPresenter(injector.getTargetContentsPresenter()); - documentListPresenter.queryStats(); + documentListPresenter.queryInfo(); documentListPresenter.showLoading(false); stopwatch.stop(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java index fc1d415a56..bf61825d7c 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java @@ -59,6 +59,7 @@ import org.zanata.webtrans.client.ui.DocumentListTable.DocValidationStatus; import org.zanata.webtrans.client.ui.DocumentNode; import org.zanata.webtrans.client.view.DocumentListDisplay; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; import org.zanata.webtrans.shared.model.TransUnit; @@ -288,9 +289,14 @@ public void setDocuments(List sortedList) updatePageCountAndGotoFirstPage(); } - public void queryStats() + public void queryInfo() { - int BATCH_SIZE = 1000; + queryStats(); + } + + private void queryStats() + { + int BATCH_SIZE = 100; for (int i = 0; i < nodes.size();) { @@ -459,7 +465,8 @@ public void onTransUnitUpdated(TransUnitUpdatedEvent event) if (row != null) { display.updateStats(row.intValue(), updatedDoc.getStats()); - display.updateLastTranslatedInfo(row.intValue(), event.getUpdateInfo().getTransUnit()); + AuditInfo lastTranslated = new AuditInfo(event.getUpdateInfo().getTransUnit().getLastModifiedTime(), event.getUpdateInfo().getTransUnit().getLastModifiedBy()); + display.updateLastTranslated(row.intValue(), lastTranslated); } eventBus.fireEvent(new DocumentStatsUpdatedEvent(updatedDoc.getId(), updatedDoc.getStats())); @@ -472,8 +479,7 @@ public void onTransUnitUpdated(TransUnitUpdatedEvent event) private void updateLastTranslatedInfo(DocumentInfo doc, TransUnit updatedTransUnit) { - doc.setLastTranslatedBy(updatedTransUnit.getLastModifiedBy()); - doc.setLastTranslatedDate(updatedTransUnit.getLastModifiedTime()); + doc.setLastTranslated(new AuditInfo(updatedTransUnit.getLastModifiedTime(), updatedTransUnit.getLastModifiedBy())); } /** @@ -834,36 +840,36 @@ private int compareRemaining(DocumentNode o1, DocumentNode o2) private int compareLastUpload(DocumentNode o1, DocumentNode o2) { - if (o1.getDocInfo().getLastChanged() == o2.getDocInfo().getLastChanged()) + if (o1.getDocInfo().getLastModified().getDate() == o2.getDocInfo().getLastModified().getDate()) { return 0; } - if (o1.getDocInfo().getLastChanged() == null) + if (o1.getDocInfo().getLastModified().getDate() == null) { return -1; } - if (o2.getDocInfo().getLastChanged() == null) + if (o2.getDocInfo().getLastModified().getDate() == null) { return 1; } - return o1.getDocInfo().getLastChanged().after(o2.getDocInfo().getLastChanged()) ? 1 : -1; + return o1.getDocInfo().getLastModified().getDate().after(o2.getDocInfo().getLastModified().getDate()) ? 1 : -1; } private int compareLastTranslated(DocumentNode o1, DocumentNode o2) { - if (o1.getDocInfo().getLastChanged() == o2.getDocInfo().getLastChanged()) + if (o1.getDocInfo().getLastTranslated().getDate() == o2.getDocInfo().getLastTranslated().getDate()) { return 0; } - if (o1.getDocInfo().getLastChanged() == null) + if (o1.getDocInfo().getLastTranslated().getDate() == null) { return -1; } - if (o2.getDocInfo().getLastChanged() == null) + if (o2.getDocInfo().getLastTranslated().getDate() == null) { return 1; } - return o1.getDocInfo().getLastChanged().after(o2.getDocInfo().getLastChanged()) ? 1 : -1; + return o1.getDocInfo().getLastTranslated().getDate().after(o2.getDocInfo().getLastTranslated().getDate()) ? 1 : -1; } } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java index 1ae40599b1..d06e3453a7 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java @@ -20,7 +20,6 @@ */ package org.zanata.webtrans.client.ui; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,9 +31,9 @@ import org.zanata.webtrans.client.ui.HasTranslationStats.LabelFormat; import org.zanata.webtrans.client.util.DateUtil; import org.zanata.webtrans.client.view.DocumentListDisplay; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; -import org.zanata.webtrans.shared.model.TransUnit; import org.zanata.webtrans.shared.model.UserWorkspaceContext; import com.google.common.base.Strings; @@ -190,8 +189,8 @@ public HashMap buildContent(List nodes, boole this.setWidget(i + 1, UNTRANSLATED_COLUMN, getUntranslatedWidget(node.getDocInfo(), statsByWords)); this.setWidget(i + 1, REMAINING_COLUMN, getRemainingWidget(node.getDocInfo())); - this.setWidget(i + 1, LAST_UPLOAD_COLUMN, new InlineLabel(getAuditInfo(node.getDocInfo().getLastModifiedBy(), node.getDocInfo().getLastChanged()))); - this.setWidget(i + 1, LAST_TRANSLATED_COLUMN, new InlineLabel(getAuditInfo(node.getDocInfo().getLastTranslatedBy(), node.getDocInfo().getLastTranslatedDate()))); + this.setWidget(i + 1, LAST_UPLOAD_COLUMN, new InlineLabel(getAuditInfo(node.getDocInfo().getLastModified()))); + this.setWidget(i + 1, LAST_TRANSLATED_COLUMN, new InlineLabel(getAuditInfo(node.getDocInfo().getLastTranslated()))); this.setWidget(i + 1, ACTION_COLUMN, getActionWidget(node.getDocInfo())); @@ -406,18 +405,21 @@ public void onClick(ClickEvent event) return panel; } - private String getAuditInfo(String by, Date date) + private String getAuditInfo(AuditInfo lastTranslatedInfo) { StringBuilder sb = new StringBuilder(); - if (date != null) + if (lastTranslatedInfo != null) { - sb.append(DateUtil.formatShortDate(date)); - } - if (!Strings.isNullOrEmpty(by)) - { - sb.append(" by "); - sb.append(by); + if (lastTranslatedInfo.getDate() != null) + { + sb.append(DateUtil.formatShortDate(lastTranslatedInfo.getDate())); + } + if (!Strings.isNullOrEmpty(lastTranslatedInfo.getUsername())) + { + sb.append(" by "); + sb.append(lastTranslatedInfo.getUsername()); + } } return sb.toString(); } @@ -428,10 +430,10 @@ public void updateRowHasError(int row, DocValidationStatus status) panel.setValidationResult(status); } - public void updateLastTranslatedInfo(int row, TransUnit transUnit) + public void updateLastTranslatedInfo(int row, AuditInfo lastTranslated) { HasText label = (HasText) this.getWidget(row, LAST_TRANSLATED_COLUMN); - label.setText(getAuditInfo(transUnit.getLastModifiedBy(), transUnit.getLastModifiedTime())); + label.setText(getAuditInfo(lastTranslated)); } public void updateStats(int row, TranslationStats stats, boolean statsByWords) diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java index d6f01d193d..1721c7e0bc 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java @@ -31,9 +31,9 @@ import org.zanata.webtrans.client.ui.HasPager; import org.zanata.webtrans.client.ui.InlineLink; import org.zanata.webtrans.client.ui.SearchFieldListener; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; -import org.zanata.webtrans.shared.model.TransUnit; import org.zanata.webtrans.shared.model.WorkspaceId; import com.google.gwt.user.client.ui.FormPanel.SubmitCompleteEvent; @@ -128,8 +128,6 @@ interface Listener HashMap buildContent(List nodes); - void updateLastTranslatedInfo(int row, TransUnit transUnit); - void updateStats(int row, TranslationStats stats); void setStatsFilters(Integer row); @@ -141,4 +139,6 @@ interface Listener void showRowLoading(int row); void updateRowHasError(int row, DocValidationStatus status); + + void updateLastTranslated(int intValue, AuditInfo lastTranslated); } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java index fb1e077211..e46bba86f9 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java @@ -37,9 +37,9 @@ import org.zanata.webtrans.client.ui.LoadingPanel; import org.zanata.webtrans.client.ui.Pager; import org.zanata.webtrans.client.ui.SearchField; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; -import org.zanata.webtrans.shared.model.TransUnit; import org.zanata.webtrans.shared.model.UserWorkspaceContext; import org.zanata.webtrans.shared.model.WorkspaceId; @@ -378,9 +378,9 @@ public void updateRowHasError(int row, DocValidationStatus status) } @Override - public void updateLastTranslatedInfo(int row, TransUnit transUnit) + public void updateLastTranslated(int row, AuditInfo lastTranslated) { - documentListTable.updateLastTranslatedInfo(row, transUnit); + documentListTable.updateLastTranslatedInfo(row, lastTranslated); } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java index df7cf6f34b..9814a5c3d5 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java @@ -23,6 +23,7 @@ import org.zanata.service.TranslationFileService; import org.zanata.service.TranslationStateCache; import org.zanata.webtrans.server.ActionHandlerFor; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; import org.zanata.webtrans.shared.model.ProjectIterationId; @@ -100,7 +101,7 @@ public GetDocumentListResult execute(GetDocumentList action, ExecutionContext co downloadExtensions.put(extension, "baked?docId=" + hDoc.getDocId()); } - DocumentInfo doc = new DocumentInfo(docId, hDoc.getName(), hDoc.getPath(), hDoc.getLocale().getLocaleId(), null, lastModifiedBy, hDoc.getLastChanged(), downloadExtensions, lastTranslatedBy, lastTranslatedDate); + DocumentInfo doc = new DocumentInfo(docId, hDoc.getName(), hDoc.getPath(), hDoc.getLocale().getLocaleId(), null, new AuditInfo(hDoc.getLastChanged(), lastModifiedBy), downloadExtensions, new AuditInfo(lastTranslatedDate, lastTranslatedBy)); docs.add(doc); } return new GetDocumentListResult(iterationId, docs); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/AuditInfo.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/AuditInfo.java new file mode 100644 index 0000000000..89faa5021b --- /dev/null +++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/AuditInfo.java @@ -0,0 +1,69 @@ +package org.zanata.webtrans.shared.model; + +import java.util.Date; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class AuditInfo implements IsSerializable +{ + private Date date; + private String username; + + private AuditInfo() + { + } + + public AuditInfo(Date date, String username) + { + this.date = date; + this.username = username; + } + + public Date getDate() + { + return date; + } + + public String getUsername() + { + return username; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((username == null) ? 0 : username.hashCode()); + result = prime * result + ((date == null) ? 0 : date.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AuditInfo other = (AuditInfo) obj; + if (username == null) + { + if (other.username != null) + return false; + } + else if (!username.equals(other.username)) + return false; + if (date == null) + { + if (other.date != null) + return false; + } + else if (!date.equals(other.date)) + return false; + return true; + } + +} diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java index 7d5f0b209e..7d49046b15 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java @@ -1,6 +1,5 @@ package org.zanata.webtrans.shared.model; -import java.util.Date; import java.util.Map; import org.zanata.common.LocaleId; @@ -15,12 +14,10 @@ public class DocumentInfo implements HasIdentifier, IsSerializable private String path; private LocaleId sourceLocale; private TranslationStats stats; - private String lastModifiedBy; - private Date lastChanged; + private AuditInfo lastModified; + private AuditInfo lastTranslated; private Map downloadExtensions; - private Date lastTranslatedDate; - private String lastTranslatedBy; private Boolean hasError = null; @@ -30,18 +27,16 @@ private DocumentInfo() { } - public DocumentInfo(DocumentId id, String name, String path, LocaleId sourceLocale, TranslationStats stats, String lastModifiedBy, Date lastChanged, Map downloadExtensions, String lastTranslatedBy, Date lastTranslatedDate) + public DocumentInfo(DocumentId id, String name, String path, LocaleId sourceLocale, TranslationStats stats, AuditInfo lastModified, Map downloadExtensions, AuditInfo lastTranslated) { this.id = id; this.name = name; this.path = path; this.stats = stats; this.sourceLocale = sourceLocale; - this.lastChanged = lastChanged; - this.lastModifiedBy = lastModifiedBy; + this.lastModified = lastModified; this.downloadExtensions = downloadExtensions; - this.lastTranslatedDate = lastTranslatedDate; - this.lastTranslatedBy = lastTranslatedBy; + this.lastTranslated = lastTranslated; } public DocumentId getId() @@ -74,14 +69,9 @@ public LocaleId getSourceLocale() return sourceLocale; } - public String getLastModifiedBy() + public AuditInfo getLastModified() { - return lastModifiedBy; - } - - public Date getLastChanged() - { - return lastChanged; + return lastModified; } public Map getDownloadExtensions() @@ -89,24 +79,14 @@ public Map getDownloadExtensions() return downloadExtensions; } - public Date getLastTranslatedDate() - { - return lastTranslatedDate; - } - - public String getLastTranslatedBy() - { - return lastTranslatedBy; - } - - public void setLastTranslatedDate(Date lastTranslatedDate) + public AuditInfo getLastTranslated() { - this.lastTranslatedDate = lastTranslatedDate; + return lastTranslated; } - public void setLastTranslatedBy(String lastTranslatedBy) + public void setLastTranslated(AuditInfo lastTranslated) { - this.lastTranslatedBy = lastTranslatedBy; + this.lastTranslated = lastTranslated; } public void setHasError(Boolean hasError) diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java index 66c09b16b0..457f66e264 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java @@ -44,6 +44,7 @@ import org.zanata.webtrans.client.keys.ShortcutContext; import org.zanata.webtrans.client.resources.WebTransMessages; import org.zanata.webtrans.client.view.AppDisplay; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; import org.zanata.webtrans.shared.model.UserWorkspaceContext; @@ -316,7 +317,7 @@ public void canSelectDocumentInEditorView() DocumentId docId = new DocumentId(1L, ""); // newly selected document has new stats TranslationStats newSelectedStats = new TranslationStats(new TransUnitCount(1, 2, 3), new TransUnitWords(4, 5, 6)); - DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), newSelectedStats, "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), newSelectedStats, new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); when(documentListPresenter.getDocumentInfo(docId)).thenReturn(documentInfo); // current view is editor presenter.showView(MainView.Editor); @@ -340,7 +341,7 @@ public void canSelectDocumentNotInEditorView() DocumentId docId = new DocumentId(1L, ""); // newly selected document has new stats TranslationStats newSelectedStats = new TranslationStats(new TransUnitCount(1, 2, 3), new TransUnitWords(4, 5, 6)); - DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), newSelectedStats, "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), newSelectedStats, new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); when(documentListPresenter.getDocumentInfo(docId)).thenReturn(documentInfo); // When: @@ -386,7 +387,7 @@ public void onDocumentStatsUpdateWillSetStatsIfSameDocument() presenter.setStatesForTest(projectStats, selectedDocumentStats, null, null); presenter.showView(MainView.Editor); DocumentId docId = new DocumentId(1L, ""); - DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), selectedDocumentStats, "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), selectedDocumentStats, new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); when(documentListPresenter.getDocumentInfo(docId)).thenReturn(documentInfo); presenter.selectDocument(docId); verify(display, atLeastOnce()).setStats(selectedDocumentStats, true); @@ -440,7 +441,7 @@ public void onDocumentsClickWillFireNewHistoryItemAndSwitchToDocumentView() { // Given: current token is search view and has selected doc DocumentId docId = new DocumentId(1L, ""); - DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), selectedDocumentStats, "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo documentInfo = new DocumentInfo(docId, "a.po", "pot/", new LocaleId("en-US"), selectedDocumentStats, new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); when(documentListPresenter.getDocumentInfo(docId)).thenReturn(documentInfo); when(history.getToken()).thenReturn("view:search;doc:pot/a.po"); presenter.selectDocument(docId); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java index 9d6daf5cbd..dc20d53ca1 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java @@ -46,6 +46,7 @@ import org.zanata.webtrans.client.ui.DocumentNode; import org.zanata.webtrans.client.ui.HasPager; import org.zanata.webtrans.client.view.DocumentListDisplay; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; import org.zanata.webtrans.shared.model.ProjectIterationId; @@ -340,7 +341,7 @@ public void documentSelectUpdatesHistoryToken() documentListPresenter.bind(); // simulate document click on second document - DocumentInfo docInfo = new DocumentInfo(new DocumentId(2222L, ""), "doc122", "second/path/", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(2222L, ""), "doc122", "second/path/", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); documentListPresenter.fireDocumentSelection(docInfo); verify(mockHistory).newItem(capturedHistoryToken.capture()); @@ -441,10 +442,10 @@ public void getDocumentInfo() documentListPresenter.setDocuments(buildSampleDocumentArray()); DocumentInfo docInfo = documentListPresenter.getDocumentInfo(new DocumentId(1111L, "")); - assertThat(docInfo, is(equalTo(new DocumentInfo(new DocumentId(1111L, ""), "doc111", "first/path/", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())))); + assertThat(docInfo, is(equalTo(new DocumentInfo(new DocumentId(1111L, ""), "doc111", "first/path/", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))))); docInfo = documentListPresenter.getDocumentInfo(new DocumentId(3333L, "")); - assertThat(docInfo, is(equalTo(new DocumentInfo(new DocumentId(3333L, ""), "doc123", "third/path/", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())))); + assertThat(docInfo, is(equalTo(new DocumentInfo(new DocumentId(3333L, ""), "doc123", "third/path/", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))))); } @Test @@ -512,13 +513,13 @@ private ArrayList buildSampleDocumentArray() TransUnitCount unitCount = new TransUnitCount(1, 2, 3); TransUnitWords wordCount = new TransUnitWords(4, 5, 6); - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1111L, ""), "matches", "no/filter", LocaleId.EN_US, new TranslationStats(unitCount, wordCount), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(1111L, ""), "matches", "no/filter", LocaleId.EN_US, new TranslationStats(unitCount, wordCount), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); docList.add(docInfo); - docInfo = new DocumentInfo(new DocumentId(2222L, ""), "filter", "match/exact/", LocaleId.EN_US, new TranslationStats(unitCount, wordCount), "Translator", new Date(), new HashMap(), "last translator", new Date()); + docInfo = new DocumentInfo(new DocumentId(2222L, ""), "filter", "match/exact/", LocaleId.EN_US, new TranslationStats(unitCount, wordCount), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(),"last translator")); docList.add(docInfo); - docInfo = new DocumentInfo(new DocumentId(3333L, ""), "filter", "does/not/match/exact/", LocaleId.EN_US, new TranslationStats(unitCount, wordCount), "Translator", new Date(), new HashMap(), "last translator", new Date()); + docInfo = new DocumentInfo(new DocumentId(3333L, ""), "filter", "does/not/match/exact/", LocaleId.EN_US, new TranslationStats(unitCount, wordCount), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); docList.add(docInfo); return docList; diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java index 251189bcbd..d9afd0ed3a 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java @@ -51,6 +51,7 @@ import org.zanata.webtrans.client.resources.WebTransMessages; import org.zanata.webtrans.client.rpc.CachingDispatchAsync; import org.zanata.webtrans.client.view.GlossaryDisplay; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; import org.zanata.webtrans.shared.model.GlossaryResultItem; @@ -190,7 +191,7 @@ public void fireCopyEvent() @Test public void fireSearchEvent() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -213,7 +214,7 @@ public void fireSearchEvent() public void fireSearchEventInSequentialWillBlockSecondRequestUntilFirstReturn() { // Given: - DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); when(display.getGlossaryTextBox()).thenReturn(mockGlossaryTextBox); @@ -237,7 +238,7 @@ public void fireSearchEventInSequentialWillBlockSecondRequestUntilFirstReturn() @Test public void fireSearchEventOnSuccessCallbackWithGlossaryResults() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -265,7 +266,7 @@ public void fireSearchEventOnSuccessCallbackWithGlossaryResults() @Test public void fireSearchEventOnSuccessCallbackButNoGlossaryFound() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -291,7 +292,7 @@ public void fireSearchEventOnSuccessCallbackButNoGlossaryFound() @Test public void fireSearchEventOnFailureCallback() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -315,7 +316,7 @@ public void fireSearchEventOnFailureCallback() @Test public void createGlossaryRequestForTransUnit() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); when(display.getGlossaryTextBox()).thenReturn(mockGlossaryTextBox); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java index f38aadb10d..baab891ab8 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/PathDocumentFilterTest.java @@ -10,6 +10,7 @@ import org.testng.annotations.Test; import org.zanata.common.LocaleId; import org.zanata.common.TranslationStats; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; @@ -29,7 +30,7 @@ public void setUp() throws Exception private static DocumentInfo docInfo(String name, String path) { - return new DocumentInfo(new DocumentId(1L, ""), name, path, LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + return new DocumentInfo(new DocumentId(1L, ""), name, path, LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); } @Test diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java index 1ed1420e1f..dfdf145a80 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java @@ -42,6 +42,7 @@ import org.zanata.webtrans.client.rpc.CachingDispatchAsync; import org.zanata.webtrans.client.view.TranslationMemoryDisplay; import org.zanata.webtrans.shared.auth.Identity; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DiffMode; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; @@ -184,7 +185,7 @@ public void fireCopyEvent() public void createTMRequestForTransUnit() { WorkspaceId workspaceId = new WorkspaceId(new ProjectIterationId("projectSlug", "iterationSlug", ProjectType.Podir), LocaleId.EN_US); - DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator")); when(display.getTmTextBox()).thenReturn(tMTextBox); when(tMTextBox.getText()).thenReturn("query"); @@ -209,7 +210,7 @@ public void willDoNothingIfAlreadyHaveSubmittedRequest() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))); // When: presenter.createTMRequestForTransUnit(TestFixture.makeTransUnit(1)); @@ -254,7 +255,7 @@ public void canFireSearchEvent() ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, targetLocale), "workspaceName", targetLocale.getId())); LocaleId sourceLocale = new LocaleId("en-US"); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", sourceLocale, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", sourceLocale, new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))); when(display.getTmTextBox()).thenReturn(tMTextBox); when(tMTextBox.getText()).thenReturn("search query"); when(display.getSearchType()).thenReturn(searchType); @@ -282,7 +283,7 @@ public void fireSearchEventCallbackOnFailure() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))); when(display.getTmTextBox()).thenReturn(tMTextBox); when(display.getSearchType()).thenReturn(searchType); @@ -307,7 +308,7 @@ public void fireSearchEventCallbackOnSuccess() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))); when(display.getTmTextBox()).thenReturn(tMTextBox); when(tMTextBox.getText()).thenReturn("search query"); when(display.getSearchType()).thenReturn(searchType); @@ -336,7 +337,7 @@ public void fireSearchEventCallbackOnSuccessButResultIsEmpty() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))); when(display.getTmTextBox()).thenReturn(tMTextBox); when(display.getSearchType()).thenReturn(searchType); when(searchType.getValue()).thenReturn(SearchType.FUZZY); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java index fc40e87d6d..479c138aea 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java @@ -8,6 +8,7 @@ import org.zanata.webtrans.client.presenter.UserConfigHolder; import org.zanata.webtrans.shared.auth.EditorClientId; import org.zanata.webtrans.shared.auth.Identity; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; import org.zanata.webtrans.shared.model.Person; @@ -43,7 +44,7 @@ public void execute() Log.info("ENTER DummyActivateWorkspaceCommand.execute()"); WorkspaceContext context = new WorkspaceContext(action.getWorkspaceId(), "Dummy Workspace", "Mock Sweedish"); UserWorkspaceContext userWorkspaceContext = new UserWorkspaceContext(context, true, true, true); - userWorkspaceContext.setSelectedDoc(new DocumentInfo(new DocumentId(new Long(1), "Dummy path/Dummy doc"), "Dummy doc", "Dummy path", LocaleId.EN_US, null, "Translator", new Date(), new HashMap(), "last translator", new Date())); + userWorkspaceContext.setSelectedDoc(new DocumentInfo(new DocumentId(new Long(1), "Dummy path/Dummy doc"), "Dummy doc", "Dummy path", LocaleId.EN_US, null, new AuditInfo(new Date(), "Translator"), new HashMap(), new AuditInfo(new Date(), "last translator"))); Identity identity = new Identity(new EditorClientId("123456", 1), new Person(new PersonId("bob"), "Bob The Builder", "http://www.gravatar.com/avatar/bob@zanata.org?d=mm&s=16")); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java index 98941a3925..4e5181d976 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java @@ -12,6 +12,7 @@ import org.zanata.common.TransUnitCount; import org.zanata.common.TransUnitWords; import org.zanata.common.TranslationStats; +import org.zanata.webtrans.shared.model.AuditInfo; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.DocumentInfo; import org.zanata.webtrans.shared.model.ProjectIterationId; @@ -49,20 +50,20 @@ private ArrayList generateTransUnitSampleData() extensions.put(".po", ""); ArrayList names = new ArrayList(); - names.add(new DocumentInfo(new DocumentId(new Long(0), ""), "name0", "", LocaleId.EN_US, newStats(0), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(1), ""), "path1name1", "path/1", LocaleId.EN_US, newStats(1), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(2), ""), "path1name2", "path/1", LocaleId.EN_US, newStats(2), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(3), ""), "path2name1", "path/2", LocaleId.EN_US, newStats(3), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(4), ""), "path2name2", "path/2", LocaleId.EN_US, newStats(4), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(5), ""), "name2", "", LocaleId.EN_US, newStats(5), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(6), ""), "name1", "", LocaleId.EN_US, newStats(6), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(7), ""), "long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "", LocaleId.EN_US, newStats(7), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(new Long(8), ""), "another long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "long path, a path which is, again, really quite long, and also too wide to be displayed without scrolling (in most cases)", LocaleId.EN_US, newStats(8), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(0), ""), "name0", "", LocaleId.EN_US, newStats(0), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(1), ""), "path1name1", "path/1", LocaleId.EN_US, newStats(1), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(2), ""), "path1name2", "path/1", LocaleId.EN_US, newStats(2), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(3), ""), "path2name1", "path/2", LocaleId.EN_US, newStats(3), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(4), ""), "path2name2", "path/2", LocaleId.EN_US, newStats(4), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(5), ""), "name2", "", LocaleId.EN_US, newStats(5), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(6), ""), "name1", "", LocaleId.EN_US, newStats(6), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(7), ""), "long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "", LocaleId.EN_US, newStats(7), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); + names.add(new DocumentInfo(new DocumentId(new Long(8), ""), "another long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "long path, a path which is, again, really quite long, and also too wide to be displayed without scrolling (in most cases)", LocaleId.EN_US, newStats(8), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); for (int n = 0; n < 100; n++) { // two digit numbers, to make sorting happier names.add(new DocumentInfo(new DocumentId(new Long(n), ""), "multi" + n, "", - LocaleId.EN_US, newStats(n), "Translator", new Date(), extensions, "last translator", new Date())); + LocaleId.EN_US, newStats(n), new AuditInfo(new Date(), "Translator"), extensions, new AuditInfo(new Date(), "last translator"))); } return names; }