[Tynstep-svn] r160 - in trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework: . gin
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Sat Jul 31 02:26:49 MST 2010
Author: ChrisBurrell
Date: 2010-07-31 02:26:49 -0700 (Sat, 31 Jul 2010)
New Revision: 160
Added:
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepClientModule.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepInjector.java
Removed:
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Layout.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Passage.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepCssResources.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepResources.java
Modified:
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepEventBus.java
Log:
commiting fix to remove unecessary compile files causing assembler to overwrite gwtp compilation
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Layout.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Layout.java 2010-07-31 09:22:46 UTC (rev 159)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Layout.java 2010-07-31 09:26:49 UTC (rev 160)
@@ -1,11 +0,0 @@
-package com.tyndalehouse.step.web.client.framework;
-
-import com.google.gwt.resources.client.CssResource;
-
-public interface Layout extends CssResource {
- String inlinePanel();
-
- String floatRight();
-
- String floatLeft();
-}
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Passage.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Passage.java 2010-07-31 09:22:46 UTC (rev 159)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/Passage.java 2010-07-31 09:26:49 UTC (rev 160)
@@ -1,23 +0,0 @@
-package com.tyndalehouse.step.web.client.framework;
-
-import com.google.gwt.resources.client.CssResource;
-
-public interface Passage extends CssResource {
-
- String lineBreak();
-
- String title();
-
- String quote();
-
- String versePanel();
-
- String transChange();
-
- String word();
-
- String verseNumber();
-
- String lemma();
-
-}
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepCssResources.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepCssResources.java 2010-07-31 09:22:46 UTC (rev 159)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepCssResources.java 2010-07-31 09:26:49 UTC (rev 160)
@@ -1,11 +0,0 @@
-package com.tyndalehouse.step.web.client.framework;
-
-import com.google.gwt.resources.client.CssResource;
-
-public interface StepCssResources extends CssResource {
- /** displaying a component */
- String visible();
-
- /** hiding a component */
- String invisible();
-}
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepEventBus.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepEventBus.java 2010-07-31 09:22:46 UTC (rev 159)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepEventBus.java 2010-07-31 09:26:49 UTC (rev 160)
@@ -6,13 +6,14 @@
import com.mvp4g.client.annotation.Events;
import com.mvp4g.client.annotation.Start;
import com.mvp4g.client.event.EventBus;
-import com.tyndalehouse.step.web.client.gin.StepClientModule;
+import com.tyndalehouse.step.web.client.framework.gin.StepClientModule;
import com.tyndalehouse.step.web.client.presenter.BookmarkPresenter;
import com.tyndalehouse.step.web.client.presenter.FilterResultsPresenter;
import com.tyndalehouse.step.web.client.presenter.ModuleSideBarPresenter;
+import com.tyndalehouse.step.web.client.presenter.PassagePresenter;
import com.tyndalehouse.step.web.client.presenter.ScripturePresenter;
import com.tyndalehouse.step.web.client.presenter.StepPresenter;
-import com.tyndalehouse.step.web.client.toolkit.SideBarModule;
+import com.tyndalehouse.step.web.client.toolkit.data.SideBarModule;
import com.tyndalehouse.step.web.client.toolkit.timeline.helpers.CurrentBandStats;
import com.tyndalehouse.step.web.client.view.StepView;
@@ -74,6 +75,15 @@
void scriptureChanged(String newReference, ScripturePresenterPosition position);
/**
+ * requests all words associated with a set of lemmas to be highlighted
+ *
+ * @param lemmas
+ * the list of lemmas
+ */
+ @Event(handlers = PassagePresenter.class)
+ void highlightWords(String[] lemmas);
+
+ /**
* alerts the UI that a scripture has been retrieved successfully from the
* server
*
@@ -86,4 +96,5 @@
// those stored as well
@Event(handlers = { BookmarkPresenter.class })
void scriptureChangedSuccessfully(String referenceShortName);
+
}
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepResources.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepResources.java 2010-07-31 09:22:46 UTC (rev 159)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/StepResources.java 2010-07-31 09:26:49 UTC (rev 160)
@@ -1,40 +0,0 @@
-package com.tyndalehouse.step.web.client.framework;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.resources.client.ClientBundle;
-import com.google.gwt.resources.client.ImageResource;
-
-public interface StepResources extends ClientBundle {
- public static final StepResources RESOURCES = GWT.create(StepResources.class);
-
- @Source("com/tyndalehouse/step/web/client/sidebar/people.png")
- ImageResource peopleModule();
-
- @Source("com/tyndalehouse/step/web/client/sidebar/globe.png")
- ImageResource geographyModule();
-
- @Source("com/tyndalehouse/step/web/client/sidebar/search.png")
- ImageResource searchModule();
-
- @Source("com/tyndalehouse/step/web/client/sidebar/language.png")
- ImageResource languageModule();
-
- @Source("com/tyndalehouse/step/web/client/sidebar/books.png")
- ImageResource literatureModule();
-
- @Source("com/tyndalehouse/step/web/client/sidebar/history.png")
- ImageResource historyModule();
-
- @Source("com/tyndalehouse/step/web/client/toolkit/options.png")
- ImageResource options();
-
- @Source("com/tyndalehouse/step/web/client/toolkit/options-over.png")
- ImageResource optionsOver();
-
- @Source("com/tyndalehouse/step/web/client/css/layout.css")
- Layout layout();
-
- @Source("com/tyndalehouse/step/web/client/css/passage.css")
- Passage passage();
-
-}
Copied: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepClientModule.java (from rev 155, trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/gin/StepClientModule.java)
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepClientModule.java (rev 0)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepClientModule.java 2010-07-31 09:26:49 UTC (rev 160)
@@ -0,0 +1,24 @@
+package com.tyndalehouse.step.web.client.framework.gin;
+
+import net.customware.gwt.dispatch.client.DefaultDispatchAsync;
+import net.customware.gwt.dispatch.client.DispatchAsync;
+
+import com.google.gwt.inject.client.AbstractGinModule;
+import com.google.inject.Singleton;
+
+/**
+ * Gin configuration for the the step client. In addition to normal guice
+ * operations, this binds presenters to their views
+ *
+ * @author cjburrell
+ *
+ */
+public class StepClientModule extends AbstractGinModule {
+
+ @Override
+ protected void configure() {
+ // IMPROVEMENT change DefaultDispatchAsync to implement client side
+ // caching
+ bind(DispatchAsync.class).to(DefaultDispatchAsync.class).in(Singleton.class);
+ }
+}
Copied: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepInjector.java (from rev 150, trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/gin/StepInjector.java)
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepInjector.java (rev 0)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/framework/gin/StepInjector.java 2010-07-31 09:26:49 UTC (rev 160)
@@ -0,0 +1,14 @@
+package com.tyndalehouse.step.web.client.framework.gin;
+
+import com.google.gwt.inject.client.GinModules;
+import com.google.gwt.inject.client.Ginjector;
+
+/**
+ * Gin injector. This defines the modules all the Gin modules
+ *
+ * @author cjburrell
+ *
+ */
+ at GinModules(StepClientModule.class)
+public interface StepInjector extends Ginjector {
+}
More information about the Tynstep-svn
mailing list