[Tynstep-svn] r103 - in trunk/step-web-app/src: main/java/com/tyndalehouse/step/web/client/event main/java/com/tyndalehouse/step/web/client/presenter main/java/com/tyndalehouse/step/web/client/toolkit/timeline main/java/com/tyndalehouse/step/web/client/toolkit/timeline/helpers main/java/com/tyndalehouse/step/web/server/db/timeline main/java/com/tyndalehouse/step/web/server/handler main/java/com/tyndalehouse/step/web/shared/command main/java/com/tyndalehouse/step/web/shared/common main/java/com/tyndalehouse/step/web/shared/common/scripturelookup main/java/com/tyndalehouse/step/web/shared/common/timeline main/java/com/tyndalehouse/step/web/shared/result main/resources/com/tyndalehouse/step/web/server/db/queries test/java/com/tyndalehouse/step/web/client test/java/com/tyndalehouse/step/web/client/toolkit test/java/com/tyndalehouse/step/web/server/handlers
ChrisBurrell at crosswire.org
ChrisBurrell at crosswire.org
Sat Mar 27 09:54:04 MST 2010
Author: ChrisBurrell
Date: 2010-03-27 09:54:03 -0700 (Sat, 27 Mar 2010)
New Revision: 103
Added:
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/helpers/painters/
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetLocationsCommand.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/scripturelookup/
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/scripturelookup/BibleTextLookupType.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimeBandVisibleDate.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineBean.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineEventBean.java
trunk/step-web-app/src/main/resources/com/tyndalehouse/step/web/server/db/queries/maps/
trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/toolkit/
trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/client/toolkit/timeline/
Removed:
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/BibleTextLookupType.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimeBandVisibleDate.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineBean.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineEventBean.java
Modified:
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/event/TimelineScrollEvent.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/ScripturePresenter.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/TimelinePresenter.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeband.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeline.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimeBandVisibleDateProcessor.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimelineSetupDataProcessor.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetEventsForDateRangeHandler.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetCurrentBibleTextCommand.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetEventsForDateRangeCommand.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetEventsForDateRangeResult.java
trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetTimelineUISetupResult.java
trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetCurrentBibleTextHandlerTest.java
trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetTimelineUISetupHandlerTest.java
Log:
documentation and warnings
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/event/TimelineScrollEvent.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/event/TimelineScrollEvent.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/event/TimelineScrollEvent.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -5,7 +5,7 @@
import com.google.gwt.event.shared.GwtEvent;
import com.tyndalehouse.step.web.client.eventhandler.TimelineScrollEventHandler;
-import com.tyndalehouse.step.web.shared.common.TimeBandVisibleDate;
+import com.tyndalehouse.step.web.shared.common.timeline.TimeBandVisibleDate;
/**
* Event signalling the timeline has been scrolled. This event contains the list
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/ScripturePresenter.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/ScripturePresenter.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/ScripturePresenter.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -24,7 +24,7 @@
import com.tyndalehouse.step.web.client.toolkit.HasSource;
import com.tyndalehouse.step.web.shared.command.GetAvailableBibleVersionsCommand;
import com.tyndalehouse.step.web.shared.command.GetCurrentBibleTextCommand;
-import com.tyndalehouse.step.web.shared.common.BibleTextLookupType;
+import com.tyndalehouse.step.web.shared.common.scripturelookup.BibleTextLookupType;
import com.tyndalehouse.step.web.shared.result.GetAvailableBibleVersionsResult;
import com.tyndalehouse.step.web.shared.result.GetCurrentBibleTextResult;
import com.tyndalehouse.step.web.shared.scripture.Passage;
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/TimelinePresenter.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/TimelinePresenter.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/presenter/TimelinePresenter.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -28,9 +28,9 @@
import com.tyndalehouse.step.web.shared.command.GetEventsForDateRangeCommand;
import com.tyndalehouse.step.web.shared.command.GetTimelineOriginForScriptureCommand;
import com.tyndalehouse.step.web.shared.command.GetTimelineUISetupCommand;
-import com.tyndalehouse.step.web.shared.common.TimeBandVisibleDate;
-import com.tyndalehouse.step.web.shared.common.TimelineBean;
-import com.tyndalehouse.step.web.shared.common.TimelineEventBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimeBandVisibleDate;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineEventBean;
import com.tyndalehouse.step.web.shared.result.GetEventsForDateRangeResult;
import com.tyndalehouse.step.web.shared.result.GetTimelineOriginForScriptureResult;
import com.tyndalehouse.step.web.shared.result.GetTimelineUISetupResult;
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeband.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeband.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeband.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -16,7 +16,7 @@
import com.tyndalehouse.step.web.client.toolkit.timeline.exceptions.CannotDeleteEventException;
import com.tyndalehouse.step.web.client.toolkit.timeline.exceptions.IncapableOfCalculatingRequestWindowException;
import com.tyndalehouse.step.web.client.toolkit.timeline.helpers.TimeConversionUtil;
-import com.tyndalehouse.step.web.shared.common.TimeBandVisibleDate;
+import com.tyndalehouse.step.web.shared.common.timeline.TimeBandVisibleDate;
import com.tyndalehouse.step.web.shared.timeline.Unit;
/**
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeline.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeline.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/client/toolkit/timeline/Timeline.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -27,7 +27,7 @@
import com.tyndalehouse.step.web.client.toolkit.timeline.exceptions.TimeBandNotFoundException;
import com.tyndalehouse.step.web.client.toolkit.timeline.exceptions.UnknownFiredElement;
import com.tyndalehouse.step.web.client.toolkit.timeline.helpers.CurrentBandStats;
-import com.tyndalehouse.step.web.shared.common.TimeBandVisibleDate;
+import com.tyndalehouse.step.web.shared.common.timeline.TimeBandVisibleDate;
import com.tyndalehouse.step.web.shared.timeline.Unit;
/**
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimeBandVisibleDateProcessor.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimeBandVisibleDateProcessor.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimeBandVisibleDateProcessor.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -12,7 +12,7 @@
import com.tyndalehouse.step.web.server.db.framework.Query;
import com.tyndalehouse.step.web.server.db.framework.QueryImpl;
import com.tyndalehouse.step.web.server.db.framework.ResultSetProcessor;
-import com.tyndalehouse.step.web.shared.common.TimelineEventBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineEventBean;
/**
* Processes a list of timebands from the database
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimelineSetupDataProcessor.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimelineSetupDataProcessor.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/db/timeline/TimelineSetupDataProcessor.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -12,7 +12,7 @@
import com.tyndalehouse.step.web.server.db.framework.Query;
import com.tyndalehouse.step.web.server.db.framework.QueryImpl;
import com.tyndalehouse.step.web.server.db.framework.ResultSetProcessor;
-import com.tyndalehouse.step.web.shared.common.TimelineBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineBean;
/**
* Data processor for the Step Query framework, to parse results from the
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetEventsForDateRangeHandler.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetEventsForDateRangeHandler.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetEventsForDateRangeHandler.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -13,8 +13,8 @@
import com.tyndalehouse.step.web.server.db.framework.UnableToRunQueryException;
import com.tyndalehouse.step.web.server.db.timeline.TimeBandVisibleDateProcessor;
import com.tyndalehouse.step.web.shared.command.GetEventsForDateRangeCommand;
-import com.tyndalehouse.step.web.shared.common.TimeBandVisibleDate;
-import com.tyndalehouse.step.web.shared.common.TimelineEventBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimeBandVisibleDate;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineEventBean;
import com.tyndalehouse.step.web.shared.result.GetEventsForDateRangeResult;
/**
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/server/handler/GetTimelineUISetupHandler.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -11,7 +11,7 @@
import com.tyndalehouse.step.web.server.db.framework.UnableToRunQueryException;
import com.tyndalehouse.step.web.server.db.timeline.TimelineSetupDataProcessor;
import com.tyndalehouse.step.web.shared.command.GetTimelineUISetupCommand;
-import com.tyndalehouse.step.web.shared.common.TimelineBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineBean;
import com.tyndalehouse.step.web.shared.result.GetTimelineUISetupResult;
/**
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetCurrentBibleTextCommand.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetCurrentBibleTextCommand.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetCurrentBibleTextCommand.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -2,7 +2,7 @@
import net.customware.gwt.dispatch.shared.Action;
-import com.tyndalehouse.step.web.shared.common.BibleTextLookupType;
+import com.tyndalehouse.step.web.shared.common.scripturelookup.BibleTextLookupType;
import com.tyndalehouse.step.web.shared.result.GetCurrentBibleTextResult;
/**
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetEventsForDateRangeCommand.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetEventsForDateRangeCommand.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetEventsForDateRangeCommand.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -4,7 +4,7 @@
import net.customware.gwt.dispatch.shared.Action;
-import com.tyndalehouse.step.web.shared.common.TimeBandVisibleDate;
+import com.tyndalehouse.step.web.shared.common.timeline.TimeBandVisibleDate;
import com.tyndalehouse.step.web.shared.result.GetEventsForDateRangeResult;
/**
Added: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetLocationsCommand.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetLocationsCommand.java (rev 0)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/command/GetLocationsCommand.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -0,0 +1,21 @@
+package com.tyndalehouse.step.web.shared.command;
+
+import net.customware.gwt.dispatch.shared.Action;
+
+import com.tyndalehouse.step.web.shared.result.GetLocationsResult;
+
+/**
+ * This command captures the input to the handler to query the server for all
+ * locations pertaining to a particular passage
+ *
+ * @author CJBurrell
+ *
+ */
+public class GetLocationsCommand implements Action<GetLocationsResult> {
+
+ /**
+ * serial id
+ */
+ private static final long serialVersionUID = -4636855791737543490L;
+
+}
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/BibleTextLookupType.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/BibleTextLookupType.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/BibleTextLookupType.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -1,20 +0,0 @@
-package com.tyndalehouse.step.web.shared.common;
-
-/**
- * This enum indicates what kind of lookup is required from the server
- *
- * @author CJBurrell
- *
- */
-public enum BibleTextLookupType {
- /** a classic interlinear is required */
- CLASSIC_INTERLINEAR,
- /** a logical form, POJO form of the text is required */
- LOGICAL,
- /** only the text is required */
- PLAIN_TEXT,
- /** a reverse interlinear is required */
- REVERSE_INTERLINEAR,
- /** the text, using a default xslt is required */
- XSLT,
-}
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimeBandVisibleDate.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimeBandVisibleDate.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimeBandVisibleDate.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -1,136 +0,0 @@
-package com.tyndalehouse.step.web.shared.common;
-
-import java.io.Serializable;
-
-/**
- * This object acts as a container of the current display window on an ether.
- * timebandId identifies the timeband and is associated with a minimum and a
- * maximum date which are generally used to request things off the database.
- *
- * TODO: harmonize capital letters to be TimebandVisibleDate
- *
- * @author cjburrell
- *
- */
-public class TimeBandVisibleDate implements Serializable {
-
- /**
- * default serial id
- */
- private static final long serialVersionUID = -7384255321830177509L;
-
- /**
- * max date visible on the timeband
- */
- private long maxDate;
-
- /**
- * min date visible on the time band
- */
- private long minDate;
-
- /**
- * true indicates no request is required on the server
- */
- private boolean noRequest;
-
- /**
- * time band id
- */
- private int timebandId;
-
- /**
- * so that
- *
- * @param timebandId the timebandId referred to in the module
- * @param minDate minDate in the range of dates to ask the server
- * @param maxDate maxDate in the range of dates to the ask the server
- */
- public TimeBandVisibleDate(final int timebandId, final long minDate, final long maxDate) {
- this.timebandId = timebandId;
- this.minDate = minDate;
- this.maxDate = maxDate;
- noRequest = false;
- }
-
- /**
- * removing default constructor from view of other callers. Only accessible
- * through reflection, and therefore GWT
- */
- private TimeBandVisibleDate() {
- }
-
- /**
- * returns a TimeBandVisibleDate object tagged to indicate no request is
- * required on the server
- *
- * @return a marked TimeBandVisibleDate object, marked with a flag saying no
- * request is required
- */
- public static TimeBandVisibleDate getNoRequest() {
- final TimeBandVisibleDate tvd = new TimeBandVisibleDate();
- tvd.setNoRequest(true);
- return tvd;
- }
-
- /**
- * @return the maxDate
- */
- public long getMaxDate() {
- return maxDate;
- }
-
- /**
- * @return the minDate
- */
- public long getMinDate() {
- return minDate;
- }
-
- /**
- * @return the timebandId
- */
- public int getTimebandId() {
- return timebandId;
- }
-
- /**
- * NoRequest determines whether the values in here should be sent back.
- * Perhaps we've got everything we need already, so we don't need to send
- * anything back to the server
- *
- * @return the noRequest
- */
- public boolean isNoRequest() {
- return noRequest;
- }
-
- /**
- * @param maxDate the maxDate to set
- */
- public void setMaxDate(final long maxDate) {
- this.maxDate = maxDate;
- }
-
- /**
- * @param minDate the minDate to set
- */
- public void setMinDate(final long minDate) {
- this.minDate = minDate;
- }
-
- /**
- * @param noRequest the noRequest to set
- */
- public void setNoRequest(final boolean noRequest) {
- this.noRequest = noRequest;
- }
-
- /**
- * @param timebandId the timebandId to set
- */
- public void setTimebandId(final int timebandId) {
- this.timebandId = timebandId;
- }
-
-}
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineBean.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineBean.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineBean.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -1,130 +0,0 @@
-package com.tyndalehouse.step.web.shared.common;
-
-import java.io.Serializable;
-
-/**
- * Timeline bean represents the different timelines on which events can be
- * found... TODO: should this be renamed timeband?
- *
- * @author CJBurrell
- *
- */
-public class TimelineBean implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = -1734142151232501392L;
-
- /**
- * Timeline description from the server layer
- */
- private String timelineDescription;
-
- /**
- * timeline id sent across the wire
- */
- private int timelineId;
-
- /**
- * unit to be used when first display the timeband
- */
- private String unit;
-
- /**
- * default constructor made public
- */
- public TimelineBean() {
-
- }
-
- /**
- * @return the timelineDescription
- */
- public String getTimelineDescription() {
- return timelineDescription;
- }
-
- /**
- * @return the timelineId
- */
- public int getTimelineId() {
- return timelineId;
- }
-
- /**
- * @return the unit
- */
- public String getUnit() {
- return unit;
- }
-
- /**
- * @param timelineDescription the timelineDescription to set
- */
- public void setTimelineDescription(final String timelineDescription) {
- this.timelineDescription = timelineDescription;
- }
-
- /**
- * @param timelineId the timelineId to set
- */
- public void setTimelineId(final int timelineId) {
- this.timelineId = timelineId;
- }
-
- /**
- * sets the unit field
- *
- * @param unit the unit to be set
- */
- public void setUnit(final String unit) {
- this.unit = unit;
-
- }
-
- // /**
- // * @return the minDate
- // */
- // public long getMinDate() {
- // return minDate;
- // }
- //
- // /**
- // * @param minDate the minDate to set
- // */
- // public void setMinDate(long minDate) {
- // this.minDate = minDate;
- // }
- //
- // /**
- // * @return the maxDate
- // */
- // public long getMaxDate() {
- // return maxDate;
- // }
- //
- // /**
- // * @param maxDate the maxDate to set
- // */
- // public void setMaxDate(long maxDate) {
- // this.maxDate = maxDate;
- // }
-
- // /**
- // * @return the timelineCode
- // */
- // public String getTimelineCode() {
- // return timelineCode;
- // }
- //
- // public void setEventCount(int eventCount) {
- // this.eventCount = eventCount;
- // }
- //
- // /**
- // * @return the eventCount
- // */
- // public int getEventCount() {
- // return eventCount;
- // }
-}
Deleted: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineEventBean.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineEventBean.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineEventBean.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -1,235 +0,0 @@
-package com.tyndalehouse.step.web.shared.common;
-
-import java.io.Serializable;
-
-/**
- * An Time Event bean, containing all the relevant fields passed from the server
- * to the client. For e.g. the description of the event, its id, the dates, etc.
- *
- * @author cjburrell
- *
- */
-public class TimelineEventBean implements Serializable {
-
- /**
- * serial id
- */
- private static final long serialVersionUID = -7664806988001700477L;
-
- /**
- * The certainty of dating, as provided in input CSV files
- */
- private String certainty;
-
- /**
- * the event id
- */
- private int eventId;
-
- /**
- * the type of the event, where we distinguish battles, from births, etc.
- * (TODO: still to be done)
- */
- private int eventTypeId;
-
- /**
- * the from date
- */
- private Long fromDate;
-
- /**
- * how precise the date is, whether to the day, month, etc. see schema
- * definition for details
- */
- private String fromPrecision;
-
- /**
- * Name/Description of the event
- */
- private String name;
-
- /**
- * The timeband/timeline on which the event should be displayed
- */
- private int timelineId;
-
- /**
- * the to-date in the case of a duration
- */
- private Long toDate;
-
- /**
- * the precision of the "to-date", whether to the day, month, etc. see
- * schema definition for details
- */
- private String toPrecision;
-
- /**
- * making public
- */
- public TimelineEventBean() {
-
- }
-
- /**
- * a constructor to set up everything in one go
- *
- * @param eventId the event id from the database
- * @param fromDate the from date, at which the event starts/is
- * @param toDate the to date, if the date is a duratio
- * @param fromPrecision how precise the from date is (see schema for more
- * details)
- * @param toPrecision how precise the to date is (see schema for more
- * details)
- * @param name the description of the event
- * @param timelineId the timeband on which to be located
- * @param importanceId the importance id as defined in the input files
- * @param certainty the certainty as defined in the input files
- * @param eventTypeId the event type, describing different types, and
- * therefore different representations of the event on the UI
- *
- */
- // CHECKSTYLE:OFF
- public TimelineEventBean(final int eventId, final Long fromDate, final Long toDate,
- final String fromPrecision, final String toPrecision, final String name, final int timelineId,
- final int importanceId, final String certainty, final int eventTypeId) {
- // CHECKSTYLE:ON
- this.eventId = eventId;
- this.fromDate = fromDate;
- this.toDate = toDate;
- this.fromPrecision = fromPrecision;
- this.toPrecision = toPrecision;
- this.timelineId = timelineId;
- this.certainty = certainty;
- this.eventTypeId = eventTypeId;
- this.name = name;
- }
-
- /**
- * @return the certainty
- */
- public String getCertainty() {
- return certainty;
- }
-
- /**
- * @return the eventId
- */
- public int getEventId() {
- return eventId;
- }
-
- /**
- * @return the eventTypeId
- */
- public int getEventTypeId() {
- return eventTypeId;
- }
-
- /**
- * @return the fromDate
- */
- public Long getFromDate() {
- return fromDate;
- }
-
- /**
- * @return the fromPrecision
- */
- public String getFromPrecision() {
- return fromPrecision;
- }
-
- /**
- * returns the name/description of the event
- *
- * @return the description of the event
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the timelineId
- */
- public int getTimelineId() {
- return timelineId;
- }
-
- /**
- * @return the toDate
- */
- public Long getToDate() {
- return toDate;
- }
-
- /**
- * @return the toPrecision
- */
- public String getToPrecision() {
- return toPrecision;
- }
-
- /**
- * @param certainty the certainty to set
- */
- public void setCertainty(final String certainty) {
- this.certainty = certainty;
- }
-
- /**
- * @param eventId the eventId to set
- */
- public void setEventId(final int eventId) {
- this.eventId = eventId;
- }
-
- /**
- * @param eventTypeId the eventTypeId to set
- */
- public void setEventTypeId(final int eventTypeId) {
- this.eventTypeId = eventTypeId;
- }
-
- /**
- * @param fromDate the fromDate to set
- */
- public void setFromDate(final Long fromDate) {
- this.fromDate = fromDate;
- }
-
- /**
- * @param fromPrecision the fromPrecision to set
- */
- public void setFromPrecision(final String fromPrecision) {
- this.fromPrecision = fromPrecision;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(final String name) {
- this.name = name;
- }
-
- /**
- * @param timelineId the timelineId to set
- */
- public void setTimelineId(final int timelineId) {
- this.timelineId = timelineId;
- }
-
- /**
- * @param toDate the toDate to set
- */
- public void setToDate(final Long toDate) {
- this.toDate = toDate;
- }
-
- /**
- * @param toPrecision the toPrecision to set
- */
- public void setToPrecision(final String toPrecision) {
- this.toPrecision = toPrecision;
- }
-}
Copied: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/scripturelookup/BibleTextLookupType.java (from rev 102, trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/BibleTextLookupType.java)
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/scripturelookup/BibleTextLookupType.java (rev 0)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/scripturelookup/BibleTextLookupType.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -0,0 +1,20 @@
+package com.tyndalehouse.step.web.shared.common.scripturelookup;
+
+/**
+ * This enum indicates what kind of lookup is required from the server
+ *
+ * @author CJBurrell
+ *
+ */
+public enum BibleTextLookupType {
+ /** a classic interlinear is required */
+ CLASSIC_INTERLINEAR,
+ /** a logical form, POJO form of the text is required */
+ LOGICAL,
+ /** only the text is required */
+ PLAIN_TEXT,
+ /** a reverse interlinear is required */
+ REVERSE_INTERLINEAR,
+ /** the text, using a default xslt is required */
+ XSLT,
+}
Copied: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimeBandVisibleDate.java (from rev 102, trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimeBandVisibleDate.java)
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimeBandVisibleDate.java (rev 0)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimeBandVisibleDate.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -0,0 +1,136 @@
+package com.tyndalehouse.step.web.shared.common.timeline;
+
+import java.io.Serializable;
+
+/**
+ * This object acts as a container of the current display window on an ether.
+ * timebandId identifies the timeband and is associated with a minimum and a
+ * maximum date which are generally used to request things off the database.
+ *
+ * TODO: harmonize capital letters to be TimebandVisibleDate
+ *
+ * @author cjburrell
+ *
+ */
+public class TimeBandVisibleDate implements Serializable {
+
+ /**
+ * default serial id
+ */
+ private static final long serialVersionUID = -7384255321830177509L;
+
+ /**
+ * max date visible on the timeband
+ */
+ private long maxDate;
+
+ /**
+ * min date visible on the time band
+ */
+ private long minDate;
+
+ /**
+ * true indicates no request is required on the server
+ */
+ private boolean noRequest;
+
+ /**
+ * time band id
+ */
+ private int timebandId;
+
+ /**
+ * so that
+ *
+ * @param timebandId the timebandId referred to in the module
+ * @param minDate minDate in the range of dates to ask the server
+ * @param maxDate maxDate in the range of dates to the ask the server
+ */
+ public TimeBandVisibleDate(final int timebandId, final long minDate, final long maxDate) {
+ this.timebandId = timebandId;
+ this.minDate = minDate;
+ this.maxDate = maxDate;
+ noRequest = false;
+ }
+
+ /**
+ * removing default constructor from view of other callers. Only accessible
+ * through reflection, and therefore GWT
+ */
+ private TimeBandVisibleDate() {
+ }
+
+ /**
+ * returns a TimeBandVisibleDate object tagged to indicate no request is
+ * required on the server
+ *
+ * @return a marked TimeBandVisibleDate object, marked with a flag saying no
+ * request is required
+ */
+ public static TimeBandVisibleDate getNoRequest() {
+ final TimeBandVisibleDate tvd = new TimeBandVisibleDate();
+ tvd.setNoRequest(true);
+ return tvd;
+ }
+
+ /**
+ * @return the maxDate
+ */
+ public long getMaxDate() {
+ return maxDate;
+ }
+
+ /**
+ * @return the minDate
+ */
+ public long getMinDate() {
+ return minDate;
+ }
+
+ /**
+ * @return the timebandId
+ */
+ public int getTimebandId() {
+ return timebandId;
+ }
+
+ /**
+ * NoRequest determines whether the values in here should be sent back.
+ * Perhaps we've got everything we need already, so we don't need to send
+ * anything back to the server
+ *
+ * @return the noRequest
+ */
+ public boolean isNoRequest() {
+ return noRequest;
+ }
+
+ /**
+ * @param maxDate the maxDate to set
+ */
+ public void setMaxDate(final long maxDate) {
+ this.maxDate = maxDate;
+ }
+
+ /**
+ * @param minDate the minDate to set
+ */
+ public void setMinDate(final long minDate) {
+ this.minDate = minDate;
+ }
+
+ /**
+ * @param noRequest the noRequest to set
+ */
+ public void setNoRequest(final boolean noRequest) {
+ this.noRequest = noRequest;
+ }
+
+ /**
+ * @param timebandId the timebandId to set
+ */
+ public void setTimebandId(final int timebandId) {
+ this.timebandId = timebandId;
+ }
+
+}
Copied: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineBean.java (from rev 102, trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineBean.java)
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineBean.java (rev 0)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineBean.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -0,0 +1,130 @@
+package com.tyndalehouse.step.web.shared.common.timeline;
+
+import java.io.Serializable;
+
+/**
+ * Timeline bean represents the different timelines on which events can be
+ * found... TODO: should this be renamed timeband?
+ *
+ * @author CJBurrell
+ *
+ */
+public class TimelineBean implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1734142151232501392L;
+
+ /**
+ * Timeline description from the server layer
+ */
+ private String timelineDescription;
+
+ /**
+ * timeline id sent across the wire
+ */
+ private int timelineId;
+
+ /**
+ * unit to be used when first display the timeband
+ */
+ private String unit;
+
+ /**
+ * default constructor made public
+ */
+ public TimelineBean() {
+
+ }
+
+ /**
+ * @return the timelineDescription
+ */
+ public String getTimelineDescription() {
+ return timelineDescription;
+ }
+
+ /**
+ * @return the timelineId
+ */
+ public int getTimelineId() {
+ return timelineId;
+ }
+
+ /**
+ * @return the unit
+ */
+ public String getUnit() {
+ return unit;
+ }
+
+ /**
+ * @param timelineDescription the timelineDescription to set
+ */
+ public void setTimelineDescription(final String timelineDescription) {
+ this.timelineDescription = timelineDescription;
+ }
+
+ /**
+ * @param timelineId the timelineId to set
+ */
+ public void setTimelineId(final int timelineId) {
+ this.timelineId = timelineId;
+ }
+
+ /**
+ * sets the unit field
+ *
+ * @param unit the unit to be set
+ */
+ public void setUnit(final String unit) {
+ this.unit = unit;
+
+ }
+
+ // /**
+ // * @return the minDate
+ // */
+ // public long getMinDate() {
+ // return minDate;
+ // }
+ //
+ // /**
+ // * @param minDate the minDate to set
+ // */
+ // public void setMinDate(long minDate) {
+ // this.minDate = minDate;
+ // }
+ //
+ // /**
+ // * @return the maxDate
+ // */
+ // public long getMaxDate() {
+ // return maxDate;
+ // }
+ //
+ // /**
+ // * @param maxDate the maxDate to set
+ // */
+ // public void setMaxDate(long maxDate) {
+ // this.maxDate = maxDate;
+ // }
+
+ // /**
+ // * @return the timelineCode
+ // */
+ // public String getTimelineCode() {
+ // return timelineCode;
+ // }
+ //
+ // public void setEventCount(int eventCount) {
+ // this.eventCount = eventCount;
+ // }
+ //
+ // /**
+ // * @return the eventCount
+ // */
+ // public int getEventCount() {
+ // return eventCount;
+ // }
+}
Copied: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineEventBean.java (from rev 102, trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/TimelineEventBean.java)
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineEventBean.java (rev 0)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/common/timeline/TimelineEventBean.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -0,0 +1,235 @@
+package com.tyndalehouse.step.web.shared.common.timeline;
+
+import java.io.Serializable;
+
+/**
+ * An Time Event bean, containing all the relevant fields passed from the server
+ * to the client. For e.g. the description of the event, its id, the dates, etc.
+ *
+ * @author cjburrell
+ *
+ */
+public class TimelineEventBean implements Serializable {
+
+ /**
+ * serial id
+ */
+ private static final long serialVersionUID = -7664806988001700477L;
+
+ /**
+ * The certainty of dating, as provided in input CSV files
+ */
+ private String certainty;
+
+ /**
+ * the event id
+ */
+ private int eventId;
+
+ /**
+ * the type of the event, where we distinguish battles, from births, etc.
+ * (TODO: still to be done)
+ */
+ private int eventTypeId;
+
+ /**
+ * the from date
+ */
+ private Long fromDate;
+
+ /**
+ * how precise the date is, whether to the day, month, etc. see schema
+ * definition for details
+ */
+ private String fromPrecision;
+
+ /**
+ * Name/Description of the event
+ */
+ private String name;
+
+ /**
+ * The timeband/timeline on which the event should be displayed
+ */
+ private int timelineId;
+
+ /**
+ * the to-date in the case of a duration
+ */
+ private Long toDate;
+
+ /**
+ * the precision of the "to-date", whether to the day, month, etc. see
+ * schema definition for details
+ */
+ private String toPrecision;
+
+ /**
+ * making public
+ */
+ public TimelineEventBean() {
+
+ }
+
+ /**
+ * a constructor to set up everything in one go
+ *
+ * @param eventId the event id from the database
+ * @param fromDate the from date, at which the event starts/is
+ * @param toDate the to date, if the date is a duratio
+ * @param fromPrecision how precise the from date is (see schema for more
+ * details)
+ * @param toPrecision how precise the to date is (see schema for more
+ * details)
+ * @param name the description of the event
+ * @param timelineId the timeband on which to be located
+ * @param importanceId the importance id as defined in the input files
+ * @param certainty the certainty as defined in the input files
+ * @param eventTypeId the event type, describing different types, and
+ * therefore different representations of the event on the UI
+ *
+ */
+ // CHECKSTYLE:OFF
+ public TimelineEventBean(final int eventId, final Long fromDate, final Long toDate,
+ final String fromPrecision, final String toPrecision, final String name, final int timelineId,
+ final int importanceId, final String certainty, final int eventTypeId) {
+ // CHECKSTYLE:ON
+ this.eventId = eventId;
+ this.fromDate = fromDate;
+ this.toDate = toDate;
+ this.fromPrecision = fromPrecision;
+ this.toPrecision = toPrecision;
+ this.timelineId = timelineId;
+ this.certainty = certainty;
+ this.eventTypeId = eventTypeId;
+ this.name = name;
+ }
+
+ /**
+ * @return the certainty
+ */
+ public String getCertainty() {
+ return certainty;
+ }
+
+ /**
+ * @return the eventId
+ */
+ public int getEventId() {
+ return eventId;
+ }
+
+ /**
+ * @return the eventTypeId
+ */
+ public int getEventTypeId() {
+ return eventTypeId;
+ }
+
+ /**
+ * @return the fromDate
+ */
+ public Long getFromDate() {
+ return fromDate;
+ }
+
+ /**
+ * @return the fromPrecision
+ */
+ public String getFromPrecision() {
+ return fromPrecision;
+ }
+
+ /**
+ * returns the name/description of the event
+ *
+ * @return the description of the event
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the timelineId
+ */
+ public int getTimelineId() {
+ return timelineId;
+ }
+
+ /**
+ * @return the toDate
+ */
+ public Long getToDate() {
+ return toDate;
+ }
+
+ /**
+ * @return the toPrecision
+ */
+ public String getToPrecision() {
+ return toPrecision;
+ }
+
+ /**
+ * @param certainty the certainty to set
+ */
+ public void setCertainty(final String certainty) {
+ this.certainty = certainty;
+ }
+
+ /**
+ * @param eventId the eventId to set
+ */
+ public void setEventId(final int eventId) {
+ this.eventId = eventId;
+ }
+
+ /**
+ * @param eventTypeId the eventTypeId to set
+ */
+ public void setEventTypeId(final int eventTypeId) {
+ this.eventTypeId = eventTypeId;
+ }
+
+ /**
+ * @param fromDate the fromDate to set
+ */
+ public void setFromDate(final Long fromDate) {
+ this.fromDate = fromDate;
+ }
+
+ /**
+ * @param fromPrecision the fromPrecision to set
+ */
+ public void setFromPrecision(final String fromPrecision) {
+ this.fromPrecision = fromPrecision;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ /**
+ * @param timelineId the timelineId to set
+ */
+ public void setTimelineId(final int timelineId) {
+ this.timelineId = timelineId;
+ }
+
+ /**
+ * @param toDate the toDate to set
+ */
+ public void setToDate(final Long toDate) {
+ this.toDate = toDate;
+ }
+
+ /**
+ * @param toPrecision the toPrecision to set
+ */
+ public void setToPrecision(final String toPrecision) {
+ this.toPrecision = toPrecision;
+ }
+}
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetEventsForDateRangeResult.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetEventsForDateRangeResult.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetEventsForDateRangeResult.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -5,7 +5,7 @@
import net.customware.gwt.dispatch.shared.Result;
-import com.tyndalehouse.step.web.shared.common.TimelineEventBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineEventBean;
/**
* Result containing all events requested within a particular date range.
Modified: trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetTimelineUISetupResult.java
===================================================================
--- trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetTimelineUISetupResult.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/main/java/com/tyndalehouse/step/web/shared/result/GetTimelineUISetupResult.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -4,7 +4,7 @@
import net.customware.gwt.dispatch.shared.Result;
-import com.tyndalehouse.step.web.shared.common.TimelineBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineBean;
/**
* Response from a @see
Modified: trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetCurrentBibleTextHandlerTest.java
===================================================================
--- trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetCurrentBibleTextHandlerTest.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetCurrentBibleTextHandlerTest.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -12,7 +12,7 @@
import com.tyndalehouse.step.web.server.handler.GetCurrentBibleTextHandler;
import com.tyndalehouse.step.web.shared.command.GetCurrentBibleTextCommand;
-import com.tyndalehouse.step.web.shared.common.BibleTextLookupType;
+import com.tyndalehouse.step.web.shared.common.scripturelookup.BibleTextLookupType;
import com.tyndalehouse.step.web.shared.result.GetCurrentBibleTextResult;
/**
Modified: trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetTimelineUISetupHandlerTest.java
===================================================================
--- trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetTimelineUISetupHandlerTest.java 2010-03-16 18:49:07 UTC (rev 102)
+++ trunk/step-web-app/src/test/java/com/tyndalehouse/step/web/server/handlers/GetTimelineUISetupHandlerTest.java 2010-03-27 16:54:03 UTC (rev 103)
@@ -13,7 +13,7 @@
import com.tyndalehouse.step.web.server.db.framework.StepQueryRunner;
import com.tyndalehouse.step.web.server.handler.GetTimelineUISetupHandler;
-import com.tyndalehouse.step.web.shared.common.TimelineBean;
+import com.tyndalehouse.step.web.shared.common.timeline.TimelineBean;
/**
* Testing the timeline setup handler
More information about the Tynstep-svn
mailing list