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

Commit

Permalink
Merge branch 'master' into rhbz788294
Browse files Browse the repository at this point in the history 
Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  • Loading branch information
Alex Eng committed Mar 13, 2012
2 parents 5e34fc5 + 3c721a3 commit 97e6e21
Show file tree
Hide file tree
Showing 7 changed files with 330 additions and 112 deletions.
16 changes: 12 additions & 4 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
View file
Expand Up @@ -47,10 +47,18 @@ public interface CheckKey
static final int KEY_J = 'J';
static final int KEY_K = 'K';
static final int KEY_S = 'S';
static final int KEY_1 = '1';
static final int KEY_2 = '2';
static final int KEY_3 = '3';
static final int KEY_4 = '4';

static int KEY_1 = 49;
static int KEY_1_NUM = 35;

static final int KEY_2 = 50;
static final int KEY_2_NUM = 40;

static final int KEY_3 = 51;
static final int KEY_3_NUM = 34;

static final int KEY_4 = 52;
static final int KEY_4_NUM = 37;

public static enum Context
{
Expand Down
4 changes: 1 addition & 3 deletions server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
View file
Expand Up @@ -20,7 +20,6 @@
*/
package org.zanata.webtrans.client.editor;

import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.event.dom.client.KeyCodes;

Expand Down Expand Up @@ -163,8 +162,7 @@ public boolean isCtrlKey()
@Override
public boolean isCopyFromTransMem()
{
Log.info(keyCode + "");
return ctrlKey && shiftKey && (keyCode == KEY_1 || keyCode == KEY_2 || keyCode == KEY_3 || keyCode == KEY_4);
return ctrlKey && shiftKey && (keyCode == KEY_1 || keyCode == KEY_1_NUM || keyCode == KEY_2 || keyCode == KEY_2_NUM || keyCode == KEY_3 || keyCode == KEY_3_NUM || keyCode == KEY_4 || keyCode == KEY_4_NUM);
}

@Override
Expand Down
76 changes: 51 additions & 25 deletions ...r/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
View file
@@ -1,7 +1,5 @@
package org.zanata.webtrans.client.presenter;

import java.util.ArrayList;

import net.customware.gwt.presenter.client.EventBus;
import net.customware.gwt.presenter.client.widget.WidgetDisplay;
import net.customware.gwt.presenter.client.widget.WidgetPresenter;
Expand All @@ -16,8 +14,8 @@
import org.zanata.webtrans.shared.model.TranslationMemoryGlossaryItem;
import org.zanata.webtrans.shared.model.WorkspaceContext;
import org.zanata.webtrans.shared.rpc.GetTranslationMemory;
import org.zanata.webtrans.shared.rpc.GetTranslationMemory.SearchType;
import org.zanata.webtrans.shared.rpc.GetTranslationMemoryResult;
import org.zanata.webtrans.shared.rpc.HasSearchType.SearchType;

import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.cell.client.FieldUpdater;
Expand All @@ -29,53 +27,56 @@
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.HasText;
import com.google.gwt.user.client.ui.HasValue;
import com.google.gwt.view.client.ListDataProvider;
import com.google.inject.Inject;

public class TransMemoryPresenter extends WidgetPresenter<TransMemoryPresenter.Display>
{
private final WorkspaceContext workspaceContext;
private final CachingDispatchAsync dispatcher;
private GetTranslationMemory submittedRequest = null;
private GetTranslationMemory lastRequest = null;

@Inject
private TransMemoryDetailsPresenter tmInfoPresenter;

public interface Display extends WidgetDisplay
{
HasClickHandlers getSearchButton();

HasClickHandlers getClearButton();

HasValue<SearchType> getSearchType();

HasText getTmTextBox();

void reloadData(String query, ArrayList<TranslationMemoryGlossaryItem> memories);
void setDiffText(String query);

void startProcessing();

void stopProcessing();

boolean isFocused();

String getSource(int index);
void setPageSize(int size);

String getTarget(int index);
boolean isFocused();

Column<TranslationMemoryGlossaryItem, ImageResource> getDetailsColumn();

Column<TranslationMemoryGlossaryItem, String> getCopyColumn();

void renderTable();
void setDataProvider(ListDataProvider<TranslationMemoryGlossaryItem> dataProvider);
}

private final WorkspaceContext workspaceContext;
private final CachingDispatchAsync dispatcher;
private GetTranslationMemory submittedRequest = null;
private GetTranslationMemory lastRequest = null;
private TransMemoryDetailsPresenter tmInfoPresenter;
private ListDataProvider<TranslationMemoryGlossaryItem> dataProvider;

@Inject
public TransMemoryPresenter(Display display, EventBus eventBus, CachingDispatchAsync dispatcher, WorkspaceContext workspaceContext)
public TransMemoryPresenter(Display display, EventBus eventBus, CachingDispatchAsync dispatcher, TransMemoryDetailsPresenter tmInfoPresenter, WorkspaceContext workspaceContext)
{
super(display, eventBus);
this.dispatcher = dispatcher;
this.workspaceContext = workspaceContext;
this.tmInfoPresenter = tmInfoPresenter;

display.renderTable();
dataProvider = new ListDataProvider<TranslationMemoryGlossaryItem>();
display.setDataProvider(dataProvider);
}

@Override
Expand All @@ -92,6 +93,16 @@ public void onClick(ClickEvent event)
}
});

display.getClearButton().addClickHandler(new ClickHandler()
{
@Override
public void onClick(ClickEvent event)
{
display.getTmTextBox().setText("");
dataProvider.getList().clear();
}
});

registerHandler(eventBus.addHandler(TransUnitSelectionEvent.getType(), new TransUnitSelectionHandler()
{
@Override
Expand All @@ -108,11 +119,18 @@ public void onTransMemoryCopy(TransMemoryShortcutCopyEvent event)
{
if (!workspaceContext.isReadOnly())
{
String source = display.getSource(event.getIndex());
String target = display.getTarget(event.getIndex());
if (source != null && target != null)
TranslationMemoryGlossaryItem item;
try
{
item = dataProvider.getList().get(event.getIndex());
}
catch (IndexOutOfBoundsException ex)
{
item = null;
}
if (item != null)
{
eventBus.fireEvent(new CopyDataToEditorEvent(source, target));
eventBus.fireEvent(new CopyDataToEditorEvent(item.getSource(), item.getTarget()));
}
}
}
Expand All @@ -132,7 +150,7 @@ public void update(int index, TranslationMemoryGlossaryItem object, ImageResourc
@Override
public void update(int index, TranslationMemoryGlossaryItem object, String value)
{
eventBus.fireEvent(new CopyDataToEditorEvent(object.getSource(), object.getTarget()));
eventBus.fireEvent(new TransMemoryCopyEvent(object.getSource(), object.getTarget()));
}
});
}
Expand All @@ -148,6 +166,7 @@ public void createTMRequestForTransUnit(TransUnit transUnit)

private void createTMRequest(final String query, GetTranslationMemory.SearchType searchType)
{
dataProvider.getList().clear();
display.startProcessing();
final GetTranslationMemory action = new GetTranslationMemory(query, workspaceContext.getWorkspaceId().getLocaleId(), searchType);
scheduleTMRequest(action);
Expand Down Expand Up @@ -213,9 +232,16 @@ private void displayTMResult(GetTranslationMemoryResult result)
{
String query = submittedRequest.getQuery();
display.getTmTextBox().setText(query);
display.setDiffText(query);
display.getSearchType().setValue(submittedRequest.getSearchType());
ArrayList<TranslationMemoryGlossaryItem> memories = result.getMemories();
display.reloadData(query, memories);

dataProvider.getList().clear();
for (final TranslationMemoryGlossaryItem memory : result.getMemories())
{
dataProvider.getList().add(memory);
}
display.setPageSize(dataProvider.getList().size());
dataProvider.refresh();
}

@Override
Expand Down
12 changes: 8 additions & 4 deletions ...r/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
View file
Expand Up @@ -236,16 +236,20 @@ public void onPreviewNativeEvent(NativePreviewEvent event)
int index;
switch (checkKey.getKeyCode())
{
case '1':
case CheckKey.KEY_1:
case CheckKey.KEY_1_NUM:
index = 0;
break;
case '2':
case CheckKey.KEY_2:
case CheckKey.KEY_2_NUM:
index = 1;
break;
case '3':
case CheckKey.KEY_3:
case CheckKey.KEY_3_NUM:
index = 2;
break;
case '4':
case CheckKey.KEY_4:
case CheckKey.KEY_4_NUM:
index = 3;
break;
default:
Expand Down

0 comments on commit 97e6e21

Please sign in to comment.