move trans filter presenter and display to appropiate package

zanata · Sep 26, 2012 · 5fa8fc0 · 5fa8fc0
1 parent fb04d16
commit 5fa8fc0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 23 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java b/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
@@ -29,9 +29,7 @@
 
 import org.zanata.webtrans.client.Application;
 import org.zanata.webtrans.client.EventProcessor;
-import org.zanata.webtrans.client.editor.filter.TransFilterDisplay;
-import org.zanata.webtrans.client.editor.filter.TransFilterPresenter;
-import org.zanata.webtrans.client.editor.filter.TransFilterView;
+import org.zanata.webtrans.client.presenter.TransFilterPresenter;
 import org.zanata.webtrans.client.resources.ValidationMessages;
 import org.zanata.webtrans.client.view.SideMenuDisplay;
 import org.zanata.webtrans.client.view.SourceContentsDisplay;
@@ -86,6 +84,8 @@
 import org.zanata.webtrans.client.view.SideMenuView;
 import org.zanata.webtrans.client.view.TargetContentsDisplay;
 import org.zanata.webtrans.client.view.TargetContentsView;
+import org.zanata.webtrans.client.view.TransFilterDisplay;
+import org.zanata.webtrans.client.view.TransFilterView;
 import org.zanata.webtrans.client.view.TransMemoryDetailsDisplay;
 import org.zanata.webtrans.client.view.TransMemoryDetailsView;
 import org.zanata.webtrans.client.view.TransMemoryView;

diff --git a/...t/editor/filter/TransFilterPresenter.java → ...lient/presenter/TransFilterPresenter.java b/...t/editor/filter/TransFilterPresenter.java → ...lient/presenter/TransFilterPresenter.java
@@ -18,20 +18,18 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
  * site: http://www.fsf.org.
  */
-package org.zanata.webtrans.client.editor.filter;
-
-import net.customware.gwt.presenter.client.EventBus;
-import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+package org.zanata.webtrans.client.presenter;
 
 import org.zanata.webtrans.client.events.FindMessageEvent;
 import org.zanata.webtrans.client.events.FindMessageHandler;
 import org.zanata.webtrans.client.history.History;
 import org.zanata.webtrans.client.history.HistoryToken;
-
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import org.zanata.webtrans.client.view.TransFilterDisplay;
 import com.google.inject.Inject;
 
+import net.customware.gwt.presenter.client.EventBus;
+import net.customware.gwt.presenter.client.widget.WidgetPresenter;
+
 public class TransFilterPresenter extends WidgetPresenter<TransFilterDisplay> implements TransFilterDisplay.Listener, FindMessageHandler
 {
 

diff --git a/...ta-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java b/...ta-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
@@ -20,7 +20,6 @@
  */
 package org.zanata.webtrans.client.presenter;
 
-import org.zanata.webtrans.client.editor.filter.TransFilterPresenter;
 import org.zanata.webtrans.client.events.PageChangeEvent;
 import org.zanata.webtrans.client.events.PageChangeEventHandler;
 import org.zanata.webtrans.client.events.PageCountChangeEvent;

diff --git a/...ent/editor/filter/TransFilterDisplay.java → ...trans/client/view/TransFilterDisplay.java b/...ent/editor/filter/TransFilterDisplay.java → ...trans/client/view/TransFilterDisplay.java
@@ -1,6 +1,4 @@
-package org.zanata.webtrans.client.editor.filter;
-
-import com.google.gwt.user.client.ui.HasValue;
+package org.zanata.webtrans.client.view;
 
 import net.customware.gwt.presenter.client.widget.WidgetDisplay;
 

diff --git a/...nt/editor/filter/TransFilterMessages.java → ...rans/client/view/TransFilterMessages.java b/...nt/editor/filter/TransFilterMessages.java → ...rans/client/view/TransFilterMessages.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
  * site: http://www.fsf.org.
  */
-package org.zanata.webtrans.client.editor.filter;
+package org.zanata.webtrans.client.view;
 
 import com.google.gwt.i18n.client.LocalizableResource.DefaultLocale;
 import com.google.gwt.i18n.client.LocalizableResource.Generate;

diff --git a/...client/editor/filter/TransFilterView.java → ...webtrans/client/view/TransFilterView.java b/...client/editor/filter/TransFilterView.java → ...webtrans/client/view/TransFilterView.java
@@ -18,23 +18,19 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
  * site: http://www.fsf.org.
  */
-package org.zanata.webtrans.client.editor.filter;
+package org.zanata.webtrans.client.view;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.common.base.Strings;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.FocusEvent;
-import com.google.gwt.event.dom.client.MouseOutEvent;
-import com.google.gwt.event.dom.client.MouseOverEvent;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.resources.client.CssResource;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;

diff --git a/...ient/editor/filter/TransFilterView.ui.xml → ...btrans/client/view/TransFilterView.ui.xml b/...ient/editor/filter/TransFilterView.ui.xml → ...btrans/client/view/TransFilterView.ui.xml
@@ -2,7 +2,7 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:fui="urn:import:org.zanata.webtrans.client.ui">
 
-	<ui:style type="org.zanata.webtrans.client.editor.filter.TransFilterView.Styles">
+	<ui:style type="org.zanata.webtrans.client.view.TransFilterView.Styles">
 		.transFilterTextBox {
 			margin: 0px;
 			font-size: 16px;

diff --git a/...ar/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java b/...ar/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
@@ -6,11 +6,10 @@
 import org.mockito.MockitoAnnotations;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import org.zanata.webtrans.client.editor.filter.TransFilterDisplay;
-import org.zanata.webtrans.client.editor.filter.TransFilterPresenter;
 import org.zanata.webtrans.client.events.PageChangeEvent;
 import org.zanata.webtrans.client.events.PageCountChangeEvent;
 import org.zanata.webtrans.client.ui.HasPager;
+import org.zanata.webtrans.client.view.TransFilterDisplay;
 import org.zanata.webtrans.client.view.TransUnitNavigationDisplay;
 import org.zanata.webtrans.client.view.TransUnitsTableDisplay;