From 769115f4c7d79e663d4d00c38fb80d9404420bae Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Mon, 17 Feb 2014 15:13:41 +1000 Subject: [PATCH] remove syntax highlight editor option and spellcheck option --- .../presenter/EditorOptionsPresenter.java | 18 +------------ .../presenter/TargetContentsPresenter.java | 13 ++------- .../client/presenter/UserConfigHolder.java | 27 ------------------- .../client/resources/WebTransMessages.java | 3 --- .../client/service/UserOptionsService.java | 8 ------ .../org/zanata/webtrans/client/ui/Editor.java | 16 +++-------- .../webtrans/client/ui/SourcePanel.java | 10 +++---- .../webtrans/client/ui/ToggleEditor.java | 2 -- .../client/view/EditorOptionsDisplay.java | 2 -- .../client/view/EditorOptionsView.java | 18 +------------ .../client/view/EditorOptionsView.ui.xml | 10 ------- .../client/view/SourceContentsView.java | 5 ++-- .../client/view/TargetContentsDisplay.java | 2 -- .../client/view/TargetContentsView.java | 9 ------- .../server/rpc/LoadOptionsHandler.java | 14 ---------- .../webtrans/shared/model/UserOptions.java | 2 -- .../presenter/EditorOptionsPresenterTest.java | 23 ---------------- .../TargetContentsPresenterTest.java | 2 -- .../service/UserOptionsServiceTest.java | 8 +----- .../server/rpc/LoadOptionsHandlerTest.java | 6 ----- 20 files changed, 16 insertions(+), 182 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java index 05a6bb7d64..4ebb717b40 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java @@ -28,7 +28,6 @@ import org.zanata.webtrans.client.events.DisplaySouthPanelEvent; import org.zanata.webtrans.client.events.EditorPageSizeChangeEvent; import org.zanata.webtrans.client.events.NotificationEvent; -import org.zanata.webtrans.client.events.RefreshPageEvent; import org.zanata.webtrans.client.events.ReloadUserConfigUIEvent; import org.zanata.webtrans.client.events.ReloadUserConfigUIHandler; import org.zanata.webtrans.client.events.UserConfigChangeEvent; @@ -160,12 +159,7 @@ public void onEditorButtonsOptionChanged(Boolean editorButtons) { @Override public void onSpellCheckOptionChanged(Boolean spellCheckChkValue) { - if (userOptionsService.getConfigHolder().getState() - .isSpellCheckEnabled() != spellCheckChkValue) { - userOptionsService.getConfigHolder().setSpellCheckEnabled( - spellCheckChkValue); - eventBus.fireEvent(UserConfigChangeEvent.EDITOR_CONFIG_CHANGE_EVENT); - } + } @Override @@ -206,16 +200,6 @@ public void onDisplayTransUnitDetailsOptionChanged( eventBus.fireEvent(UserConfigChangeEvent.EDITOR_CONFIG_CHANGE_EVENT); } - @Override - public void onUseCodeMirrorOptionChanged(Boolean useCodeMirrorChkValue) { - if (userOptionsService.getConfigHolder().getState() - .isUseCodeMirrorEditor() != useCodeMirrorChkValue) { - userOptionsService.getConfigHolder().setUseCodeMirrorEditor( - useCodeMirrorChkValue); - eventBus.fireEvent(RefreshPageEvent.REDRAW_PAGE_EVENT); - } - } - @Override protected void onUnbind() { changeReferenceLangPresenter.unbind(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java index 6c63682677..9532819851 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java @@ -107,7 +107,6 @@ public class TargetContentsPresenter implements TargetContentsDisplay.Listener, // cached state private String findMessage; private boolean isDisplayButtons; - private boolean spellCheckEnabled; @Inject public TargetContentsPresenter( @@ -136,9 +135,6 @@ public TargetContentsPresenter( isDisplayButtons = userOptionsService.getConfigHolder().getState() .isDisplayButtons(); - spellCheckEnabled = - userOptionsService.getConfigHolder().getState() - .isSpellCheckEnabled(); editorKeyShortcuts.registerKeys(this); saveAsApprovedConfirmation.setListener(this); @@ -421,15 +417,11 @@ public void onUserConfigChanged(UserConfigChangeEvent event) { boolean displayButtons = userOptionsService.getConfigHolder().getState() .isDisplayButtons(); - boolean isSpellCheckEnabled = - userOptionsService.getConfigHolder().getState() - .isSpellCheckEnabled(); - if (isDisplayButtons != displayButtons - || spellCheckEnabled != isSpellCheckEnabled) { + + if (isDisplayButtons != displayButtons) { for (TargetContentsDisplay contentsDisplay : displayList) { contentsDisplay.showButtons(displayButtons); - contentsDisplay.setEnableSpellCheck(isSpellCheckEnabled); } } @@ -438,7 +430,6 @@ public void onUserConfigChanged(UserConfigChangeEvent event) { .getConfigHolder().getState() .isShowSaveApprovedWarning()); isDisplayButtons = displayButtons; - spellCheckEnabled = isSpellCheckEnabled; } @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java index dc7b1bf10b..17c177ce80 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java @@ -66,8 +66,6 @@ public boolean apply(ContentState contentState) { public static final boolean DEFAULT_FILTER = false; public static final boolean DEFAULT_DISPLAY_BUTTONS = true; public static final boolean DEFAULT_ENTER_SAVES_APPROVED = false; - public static final boolean DEFAULT_USE_CODE_MIRROR = false; - public static final boolean DEFAULT_SPELL_CHECK = true; public static final DiffMode DEFAULT_TM_DISPLAY_MODE = DiffMode.NORMAL; public static final boolean DEFAULT_SHOW_PANEL = true; public static final String DEFAULT_SELECTED_REFERENCE = "none"; @@ -81,7 +79,6 @@ public UserConfigHolder() { state.documentListPageSize = DEFAULT_DOC_LIST_PAGE_SIZE; state.navOption = NavOption.FUZZY_UNTRANSLATED; state.showError = DEFAULT_SHOW_ERROR; - state.useCodeMirrorEditor = DEFAULT_USE_CODE_MIRROR; state.showSaveApprovedWarning = DEFAULT_SHOW_SAVE_APPROVED_WARNING; state.transMemoryDisplayMode = DEFAULT_TM_DISPLAY_MODE; @@ -92,8 +89,6 @@ public UserConfigHolder() { state.filterByRejected = DEFAULT_FILTER; state.filterByHasError = DEFAULT_FILTER; - state.spellCheckEnabled = DEFAULT_SPELL_CHECK; - state.showTMPanel = DEFAULT_SHOW_PANEL; state.showGlossaryPanel = DEFAULT_SHOW_PANEL; state.showOptionalTransUnitDetails = DEFAULT_SHOW_PANEL; @@ -156,11 +151,6 @@ public void setShowError(boolean showError) { state.showError = showError; } - public void setUseCodeMirrorEditor(boolean useCodeMirrorEditor) { - state = new ConfigurationState(state); - state.useCodeMirrorEditor = useCodeMirrorEditor; - } - public void setFilterByUntranslated(boolean filterByUntranslated) { state = new ConfigurationState(state); state.filterByUntranslated = filterByUntranslated; @@ -196,11 +186,6 @@ public void setShowSaveApprovedWarning(boolean showSaveApprovedWarning) { state.showSaveApprovedWarning = showSaveApprovedWarning; } - public void setSpellCheckEnabled(boolean spellCheckEnabled) { - state = new ConfigurationState(state); - state.spellCheckEnabled = spellCheckEnabled; - } - public void setTMDisplayMode(DiffMode diffMode) { state = new ConfigurationState(state); state.transMemoryDisplayMode = diffMode; @@ -255,7 +240,6 @@ public static class ConfigurationState implements IsSerializable { private int documentListPageSize; private NavOption navOption; private boolean showError; - private boolean useCodeMirrorEditor; private boolean filterByUntranslated; private boolean filterByFuzzy; @@ -266,7 +250,6 @@ public static class ConfigurationState implements IsSerializable { private String selectedReferenceForSourceLang; private boolean showSaveApprovedWarning; - private boolean spellCheckEnabled; private DiffMode transMemoryDisplayMode; private ThemesOption displayTheme; @@ -287,7 +270,6 @@ private ConfigurationState(ConfigurationState old) { this.documentListPageSize = old.getDocumentListPageSize(); this.navOption = old.getNavOption(); this.showError = old.isShowError(); - this.useCodeMirrorEditor = old.isUseCodeMirrorEditor(); this.filterByUntranslated = old.isFilterByUntranslated(); this.filterByFuzzy = old.isFilterByFuzzy(); this.filterByTranslated = old.isFilterByTranslated(); @@ -295,7 +277,6 @@ private ConfigurationState(ConfigurationState old) { this.filterByRejected = old.isFilterByRejected(); this.filterByHasError = old.isFilterByHasError(); this.showSaveApprovedWarning = old.isShowSaveApprovedWarning(); - this.spellCheckEnabled = old.isSpellCheckEnabled(); this.transMemoryDisplayMode = old.getTransMemoryDisplayMode(); this.displayTheme = old.getDisplayTheme(); this.showTMPanel = old.isShowTMPanel(); @@ -331,10 +312,6 @@ public boolean isShowError() { return showError; } - public boolean isUseCodeMirrorEditor() { - return useCodeMirrorEditor; - } - public boolean isFilterByUntranslated() { return filterByUntranslated; } @@ -363,10 +340,6 @@ public boolean isShowSaveApprovedWarning() { return showSaveApprovedWarning; } - public boolean isSpellCheckEnabled() { - return spellCheckEnabled; - } - public DiffMode getTransMemoryDisplayMode() { return transMemoryDisplayMode; } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java index bbe34cb786..f01043d151 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java @@ -497,9 +497,6 @@ String undoUnsuccessful(@PluralCount int unsuccessfulCount, @DefaultMessage("Refresh current page") String refreshCurrentPage(); - @DefaultMessage("Enable spell check in editor (Firefox only)") - String spellCheckTooltip(); - @DefaultMessage("Translation Memory (TM) options") String transMemoryOption(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java b/zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java index 93c097e0cf..871b06e737 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java @@ -108,12 +108,6 @@ public HashMap getEditorOptions() { .toString(configHolder.getState().isEnterSavesApproved())); configMap.put(UserOptions.EditorPageSize, Integer.toString(configHolder.getState().getEditorPageSize())); - configMap.put(UserOptions.UseCodeMirrorEditor, Boolean - .toString(configHolder.getState().isUseCodeMirrorEditor())); - configMap - .put(UserOptions.EnableSpellCheck, - Boolean.toString(configHolder.getState() - .isSpellCheckEnabled())); configMap.put(UserOptions.TransMemoryDisplayMode, configHolder .getState().getTransMemoryDisplayMode().name()); configMap.put(UserOptions.DisplayTransMemory, @@ -175,8 +169,6 @@ public void loadEditorDefaultOptions() { .setEditorPageSize(UserConfigHolder.DEFAULT_EDITOR_PAGE_SIZE); configHolder .setShowSaveApprovedWarning(UserConfigHolder.DEFAULT_SHOW_SAVE_APPROVED_WARNING); - configHolder - .setUseCodeMirrorEditor(UserConfigHolder.DEFAULT_USE_CODE_MIRROR); configHolder.setTMDisplayMode(UserConfigHolder.DEFAULT_TM_DISPLAY_MODE); configHolder.setShowTMPanel(UserConfigHolder.DEFAULT_SHOW_PANEL); configHolder.setShowGlossaryPanel(UserConfigHolder.DEFAULT_SHOW_PANEL); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java index b7b3fb398c..2208098d6f 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java @@ -101,11 +101,11 @@ public void execute() { listener.onEditorClicked(id, index); } }; - if (listener.getConfigState().isUseCodeMirrorEditor()) { - textArea = new CodeMirrorEditor(onCodeMirrorFocusCallback); - } else { +// if (listener.getConfigState().isUseCodeMirrorEditor()) { +// textArea = new CodeMirrorEditor(onCodeMirrorFocusCallback); +// } else { textArea = new EditorTextArea(displayString); - } +// } initWidget(uiBinder.createAndBindUi(this)); // determine whether to show or hide buttons @@ -125,14 +125,6 @@ protected void onEnsureDebugId(String baseID) { textArea.ensureDebugId(baseID+ "target-" + index); } - @Override - public void setEnableSpellCheck(Boolean enabled) { - targetWrapper.getElement().setAttribute("contenteditable", - enabled.toString()); - targetWrapper.getElement().setAttribute("spellcheck", - enabled.toString()); - } - private void fireValidationEvent() { if (listener.canEditTranslation()) { listener.validate(this); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java index 2e88a4e07a..0a2e9da2f8 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java @@ -69,14 +69,14 @@ interface Styles extends CssResource { private String source = ""; private final TransUnitId transUnitId; - public SourcePanel(TransUnitId transUnitId, boolean useCodeMirrorEditor) { + public SourcePanel(TransUnitId transUnitId) { this.transUnitId = transUnitId; initWidget(uiBinder.createAndBindUi(this)); - if (useCodeMirrorEditor) { - sourceContent = new CodeMirrorReadOnlyWidget(); - } else { +// if (useCodeMirrorEditor) { +// sourceContent = new CodeMirrorReadOnlyWidget(); +// } else { sourceContent = new HighlightingLabel(); - } +// } sourceContentContainer.setWidget(sourceContent); sinkEvents(Event.ONCLICK); } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java index 43359956d6..d2d1d661bd 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java @@ -27,8 +27,6 @@ public interface ToggleEditor extends IsWidget, HasText, void refresh(); - void setEnableSpellCheck(Boolean enabled); - TransUnitId getId(); void switchType(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java index 759862ae18..542a029999 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java @@ -25,8 +25,6 @@ interface Listener extends void onEditorButtonsOptionChanged(Boolean editorButtons); - void onUseCodeMirrorOptionChanged(Boolean useCodeMirrorChkValue); - void onShowSaveApprovedWarningChanged(Boolean showSaveApprovedWarning); void onSpellCheckOptionChanged(Boolean spellCheckChkValue); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java index a5a93d5f43..f773e55430 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java @@ -63,7 +63,7 @@ public class EditorOptionsView extends Composite implements @UiField CheckBox showTMChk, showGlossaryChk, showOptionalTransUnitDetailsChk, - useCodeMirrorChk, showSaveApprovedWarningChk, spellCheckChk, + showSaveApprovedWarningChk, enterChk, editorButtonsChk; @UiField @@ -83,12 +83,8 @@ public EditorOptionsView(WebTransMessages messages, NavOption.class, navOptionRenderer); navOptionGroup.addToContainer(optionsContainer); - useCodeMirrorChk.setTitle(messages.useCodeMirrorEditorTooltip()); showSaveApprovedWarningChk.setTitle(messages .showSaveApprovedWarningTooltip()); - // TODO at the moment browser spell check only works in Firefox. If - // later Chrome supports it then change the tooltip. - spellCheckChk.setTitle(messages.spellCheckTooltip()); diffModeDiff.setText(uiMessages.diffModeAsDiff()); diffModeHighlight.setText(uiMessages.diffModeAsHighlight()); @@ -149,11 +145,6 @@ public void onEnterSaveOptionChanged(ValueChangeEvent event) { listener.onEnterSaveOptionChanged(enterChk.getValue()); } - @UiHandler("useCodeMirrorChk") - public void onCodeMirrorOptionChanged(ValueChangeEvent event) { - listener.onUseCodeMirrorOptionChanged(useCodeMirrorChk.getValue()); - } - @UiHandler("showSaveApprovedWarningChk") public void onShowSaveApprovedWarningChanged(ValueChangeEvent event) { @@ -161,11 +152,6 @@ public void onCodeMirrorOptionChanged(ValueChangeEvent event) { .getValue()); } - @UiHandler("spellCheckChk") - public void onSpellCheckChanged(ValueChangeEvent event) { - listener.onSpellCheckOptionChanged(spellCheckChk.getValue()); - } - @UiHandler({ "diffModeDiff", "diffModeHighlight" }) public void onDiffModeOptionChange(ValueChangeEvent event) { if (diffModeDiff.getValue()) { @@ -208,9 +194,7 @@ public void setOptionsState(UserConfigHolder.ConfigurationState state) { navOptionGroup.setDefaultSelected(state.getNavOption()); selectPageSize(state.getEditorPageSize()); - useCodeMirrorChk.setValue(state.isUseCodeMirrorEditor()); showSaveApprovedWarningChk.setValue(state.isShowSaveApprovedWarning()); - spellCheckChk.setValue(state.isSpellCheckEnabled()); if (state.getTransMemoryDisplayMode() == DiffMode.NORMAL) { diffModeDiff.setValue(true); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml index cdf417f954..087a806854 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml @@ -29,22 +29,12 @@ -
  • - - - -
    • -
  • - - - -
  • diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java index dc65522692..83ec1a49fc 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java @@ -124,11 +124,10 @@ public void setValue(TransUnit value, boolean fireEvents) { sourcePanelList.clear(); int rowIndex = 0; - boolean useCodeMirrorEditor = - configHolder.getState().isUseCodeMirrorEditor(); + for (String source : value.getSources()) { SourcePanel sourcePanel = - new SourcePanel(transUnit.getId(), useCodeMirrorEditor); + new SourcePanel(transUnit.getId()); sourcePanel.ensureDebugId(value.getRowIndex() + "-source-panel-" + rowIndex); sourcePanel.setValue(source, value.getSourceComment(), value.isPlural()); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java index 15696d8bdd..f77c1eb301 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java @@ -70,8 +70,6 @@ public interface TargetContentsDisplay extends WidgetDisplay, HasTransUnitId, void updateCachedTargetsAndVersion(List targets, Integer verNum, ContentState status); - void setEnableSpellCheck(boolean spellCheckEnabled); - void updateCommentIndicator(int commentsCount); ContentState getCachedState(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java index d10744f509..eef46e5c63 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java @@ -142,8 +142,6 @@ public void setValueAndCreateNewEditors(TransUnit transUnit) { Editor editor = new Editor(target, rowIndex, listener, transUnit.getId()); editor.ensureDebugId(transUnit.getRowIndex() + "-"); - editor.setEnableSpellCheck(listener.getConfigState() - .isSpellCheckEnabled()); editorGrid.setWidget(rowIndex, 0, editor); editors.add(editor); rowIndex++; @@ -206,13 +204,6 @@ private void setCachedTU(TransUnit newTransUnit) { buttons.setId(cachedValue.getId()); } - @Override - public void setEnableSpellCheck(boolean spellCheckEnabled) { - for (ToggleEditor editor : editors) { - editor.setEnableSpellCheck(spellCheckEnabled); - } - } - @Override public void highlightSearch(String findMessage) { for (ToggleEditor editor : editors) { diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java index 1713732dbb..4965b58a7d 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java @@ -121,20 +121,6 @@ public LoadOptionsResult execute(LoadOptionsAction action, .get(UserOptions.Themes.getPersistentName()).getValue())); } - if (filteredOptions.containsKey(UserOptions.UseCodeMirrorEditor - .getPersistentName())) { - configHolder.setUseCodeMirrorEditor(filteredOptions.get( - UserOptions.UseCodeMirrorEditor.getPersistentName()) - .getValueAsBoolean()); - } - - if (filteredOptions.containsKey(UserOptions.EnableSpellCheck - .getPersistentName())) { - configHolder.setSpellCheckEnabled(filteredOptions.get( - UserOptions.EnableSpellCheck.getPersistentName()) - .getValueAsBoolean()); - } - if (filteredOptions.containsKey(UserOptions.TransMemoryDisplayMode .getPersistentName())) { configHolder.setTMDisplayMode(DiffMode.valueOf(filteredOptions.get( diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java index 530474693f..5d5138eb51 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java @@ -13,8 +13,6 @@ public enum UserOptions implements IsSerializable { EnterSavesApproved(editor()+ ".EnterSavesApproved"), DisplayButtons(editor()+ ".DisplayButtons"), EditorPageSize(editor()+ ".PageSize"), - UseCodeMirrorEditor(editor()+ ".codeMirrorEditor"), - EnableSpellCheck(editor()+ ".enableSpellCheck"), TransMemoryDisplayMode(editor()+ ".transMemoryDisplayMode"), DisplayTransMemory(editor()+ ".displayTransMemory"), DisplayGlossary(editor()+ ".displayGlossary"), diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java index 43e60dc8e1..17e314d43d 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java @@ -213,18 +213,6 @@ public void onShowSaveApprovedWarningChanged() { UserConfigChangeEvent.EDITOR_CONFIG_CHANGE_EVENT); } - @Test - public void onSpellCheckOptionChanged() { - configHolder.setSpellCheckEnabled(false); - - presenter.onSpellCheckOptionChanged(true); - - assertThat(configHolder.getState().isSpellCheckEnabled(), - Matchers.equalTo(true)); - verify(eventBus).fireEvent( - UserConfigChangeEvent.EDITOR_CONFIG_CHANGE_EVENT); - } - @Test public void onTMDisplayModeChanged() { configHolder.setTMDisplayMode(DiffMode.HIGHLIGHT); @@ -237,17 +225,6 @@ public void onTMDisplayModeChanged() { UserConfigChangeEvent.EDITOR_CONFIG_CHANGE_EVENT); } - @Test - public void onCodeMirrorOptionChanged() { - configHolder.setUseCodeMirrorEditor(false); - - presenter.onUseCodeMirrorOptionChanged(true); - - assertThat(configHolder.getState().isUseCodeMirrorEditor(), - Matchers.equalTo(true)); - verify(eventBus).fireEvent(RefreshPageEvent.REDRAW_PAGE_EVENT); - } - @Test public void onLoadDefaultOptions() { presenter.loadDefaultOptions(); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java index a6f93bfcad..06756b73d2 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java @@ -544,7 +544,6 @@ public void testSetFocus() { public void onUserConfigChangeEvent() { // Given: change default settings in config configHolder.setDisplayButtons(false); - configHolder.setSpellCheckEnabled(false); // When: presenter @@ -555,7 +554,6 @@ public void onUserConfigChangeEvent() { verify(saveAsApprovedConfirmation).setShowSaveApprovedWarning( userOptionsService.getConfigHolder().getState() .isShowSaveApprovedWarning()); - verify(display, times(3)).setEnableSpellCheck(false); } @Test diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java index fb8b7d1722..de546a7b75 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java @@ -138,7 +138,7 @@ public void getDocumentListOptions() { public void getEditorOptions() { Map map = service.getEditorOptions(); - assertThat(map.size(), Matchers.equalTo(18)); + assertThat(map.size(), Matchers.equalTo(16)); assertThat(map.containsKey(UserOptions.ShowErrors), Matchers.equalTo(true)); @@ -151,12 +151,8 @@ public void getEditorOptions() { Matchers.equalTo(true)); assertThat(map.containsKey(UserOptions.TranslatedMessageFilter), Matchers.equalTo(true)); - assertThat(map.containsKey(UserOptions.UseCodeMirrorEditor), - Matchers.equalTo(true)); assertThat(map.containsKey(UserOptions.TransMemoryDisplayMode), Matchers.equalTo(true)); - assertThat(map.containsKey(UserOptions.EnableSpellCheck), - Matchers.equalTo(true)); assertThat(map.containsKey(UserOptions.FuzzyMessageFilter), Matchers.equalTo(true)); assertThat(map.containsKey(UserOptions.UntranslatedMessageFilter), @@ -226,8 +222,6 @@ public void loadEditorDefaultOptions() { assertThat( configHolder.getState().isShowSaveApprovedWarning(), Matchers.equalTo(UserConfigHolder.DEFAULT_SHOW_SAVE_APPROVED_WARNING)); - assertThat(configHolder.getState().isUseCodeMirrorEditor(), - Matchers.equalTo(UserConfigHolder.DEFAULT_USE_CODE_MIRROR)); assertThat(configHolder.getState().getTransMemoryDisplayMode(), Matchers.equalTo(UserConfigHolder.DEFAULT_TM_DISPLAY_MODE)); assertThat(configHolder.getState().getSelectedReferenceForSourceLang(), diff --git a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java index ef114e581a..ed5693a6a4 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java @@ -82,12 +82,6 @@ private HashMap generateConfigMap( configMap.put(UserOptions.ShowErrors, Boolean.toString(configHolder.getState().isShowError())); - configMap.put(UserOptions.UseCodeMirrorEditor, Boolean - .toString(configHolder.getState().isUseCodeMirrorEditor())); - configMap - .put(UserOptions.EnableSpellCheck, - Boolean.toString(configHolder.getState() - .isSpellCheckEnabled())); return configMap; }