diff --git a/java/com.google.gwt.osgi/.classpath b/java/com.google.gwt.osgi/.classpath index 7d23d84433e..d3b062d279c 100755 --- a/java/com.google.gwt.osgi/.classpath +++ b/java/com.google.gwt.osgi/.classpath @@ -1,6 +1,5 @@ - diff --git a/java/com.google.gwt.osgi/META-INF/MANIFEST.MF b/java/com.google.gwt.osgi/META-INF/MANIFEST.MF index 3ebccfdf386..3002f5fe5a9 100755 --- a/java/com.google.gwt.osgi/META-INF/MANIFEST.MF +++ b/java/com.google.gwt.osgi/META-INF/MANIFEST.MF @@ -5,31 +5,9 @@ Bundle-SymbolicName: com.google.gwt.osgi Bundle-Version: 2.6.0.qualifier Bundle-Vendor: GOOGLE Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-ClassPath: lib/gwt-dev.jar, - lib/gwt-user.jar, +Bundle-ClassPath: lib/gwt-user.jar, . -Export-Package: com.gargoylesoftware.htmlunit, - com.gargoylesoftware.htmlunit.attachment, - com.gargoylesoftware.htmlunit.gae, - com.gargoylesoftware.htmlunit.html, - com.gargoylesoftware.htmlunit.html.applets, - com.gargoylesoftware.htmlunit.html.impl, - com.gargoylesoftware.htmlunit.html.xpath, - com.gargoylesoftware.htmlunit.javascript, - com.gargoylesoftware.htmlunit.javascript.background, - com.gargoylesoftware.htmlunit.javascript.configuration, - com.gargoylesoftware.htmlunit.javascript.host, - com.gargoylesoftware.htmlunit.javascript.host.canvas, - com.gargoylesoftware.htmlunit.javascript.host.css, - com.gargoylesoftware.htmlunit.javascript.host.html, - com.gargoylesoftware.htmlunit.javascript.host.xml, - com.gargoylesoftware.htmlunit.javascript.regexp, - com.gargoylesoftware.htmlunit.protocol.about, - com.gargoylesoftware.htmlunit.protocol.data, - com.gargoylesoftware.htmlunit.protocol.javascript, - com.gargoylesoftware.htmlunit.util, - com.gargoylesoftware.htmlunit.xml, - com.google.gwt.activity.shared, +Export-Package: com.google.gwt.activity.shared, com.google.gwt.animation.client, com.google.gwt.animation.client.testing, com.google.gwt.aria.client, @@ -43,65 +21,9 @@ Export-Package: com.gargoylesoftware.htmlunit, com.google.gwt.core.client.impl, com.google.gwt.core.client.prefetch, com.google.gwt.core.client.testing, - com.google.gwt.core.ext, - com.google.gwt.core.ext.debug, - com.google.gwt.core.ext.linker, - com.google.gwt.core.ext.linker.impl, - com.google.gwt.core.ext.soyc, - com.google.gwt.core.ext.soyc.impl, - com.google.gwt.core.ext.typeinfo, - com.google.gwt.core.linker, com.google.gwt.core.server, com.google.gwt.core.shared, com.google.gwt.debug.client, - com.google.gwt.dev, - com.google.gwt.dev.asm, - com.google.gwt.dev.asm.commons, - com.google.gwt.dev.asm.signature, - com.google.gwt.dev.asm.tree, - com.google.gwt.dev.asm.util, - com.google.gwt.dev.cfg, - com.google.gwt.dev.generator, - com.google.gwt.dev.generator.ast, - com.google.gwt.dev.javac, - com.google.gwt.dev.javac.asm, - com.google.gwt.dev.javac.testing, - com.google.gwt.dev.javac.testing.impl, - com.google.gwt.dev.javac.typemodel, - com.google.gwt.dev.jdt, - com.google.gwt.dev.jjs, - com.google.gwt.dev.jjs.ast, - com.google.gwt.dev.jjs.ast.js, - com.google.gwt.dev.jjs.impl, - com.google.gwt.dev.jjs.impl.gflow, - com.google.gwt.dev.jjs.impl.gflow.cfg, - com.google.gwt.dev.jjs.impl.gflow.constants, - com.google.gwt.dev.jjs.impl.gflow.copy, - com.google.gwt.dev.jjs.impl.gflow.liveness, - com.google.gwt.dev.jjs.impl.gflow.unreachable, - com.google.gwt.dev.js, - com.google.gwt.dev.js.ast, - com.google.gwt.dev.js.rhino, - com.google.gwt.dev.json, - com.google.gwt.dev.protobuf, - com.google.gwt.dev.resource, - com.google.gwt.dev.resource.impl, - com.google.gwt.dev.shell, - com.google.gwt.dev.shell.ie, - com.google.gwt.dev.shell.jetty, - com.google.gwt.dev.shell.log, - com.google.gwt.dev.shell.remoteui, - com.google.gwt.dev.shell.rewrite, - com.google.gwt.dev.ui, - com.google.gwt.dev.util, - com.google.gwt.dev.util.arg, - com.google.gwt.dev.util.collect, - com.google.gwt.dev.util.editdistance, - com.google.gwt.dev.util.log, - com.google.gwt.dev.util.log.dashboard, - com.google.gwt.dev.util.log.speedtracer, - com.google.gwt.dev.util.msg, - com.google.gwt.dev.util.xml, com.google.gwt.dom.builder.client, com.google.gwt.dom.builder.shared, com.google.gwt.dom.client, @@ -146,7 +68,6 @@ Export-Package: com.gargoylesoftware.htmlunit, com.google.gwt.junit.remote, com.google.gwt.junit.server, com.google.gwt.junit.tools, - com.google.gwt.lang, com.google.gwt.layout.client, com.google.gwt.logging.client, com.google.gwt.logging.impl, @@ -176,32 +97,10 @@ Export-Package: com.gargoylesoftware.htmlunit, com.google.gwt.safehtml.client, com.google.gwt.safehtml.rebind, com.google.gwt.safehtml.shared, - com.google.gwt.soyc, - com.google.gwt.soyc.io, com.google.gwt.storage.client, com.google.gwt.text.client, com.google.gwt.text.shared, com.google.gwt.text.shared.testing, - com.google.gwt.thirdparty.debugging.sourcemap, - com.google.gwt.thirdparty.debugging.sourcemap.proto, - com.google.gwt.thirdparty.guava.common.annotations, - com.google.gwt.thirdparty.guava.common.base, - com.google.gwt.thirdparty.guava.common.base.internal, - com.google.gwt.thirdparty.guava.common.cache, - com.google.gwt.thirdparty.guava.common.collect, - com.google.gwt.thirdparty.guava.common.eventbus, - com.google.gwt.thirdparty.guava.common.io, - com.google.gwt.thirdparty.guava.common.net, - com.google.gwt.thirdparty.guava.common.primitives, - com.google.gwt.thirdparty.guava.common.util.concurrent, - com.google.gwt.thirdparty.javascript.jscomp, - com.google.gwt.thirdparty.javascript.jscomp.ant, - com.google.gwt.thirdparty.javascript.jscomp.deps, - com.google.gwt.thirdparty.javascript.jscomp.graph, - com.google.gwt.thirdparty.javascript.jscomp.parsing, - com.google.gwt.thirdparty.javascript.jscomp.regex, - com.google.gwt.thirdparty.javascript.rhino, - com.google.gwt.thirdparty.javascript.rhino.jstype, com.google.gwt.thirdparty.streamhtmlparser, com.google.gwt.thirdparty.streamhtmlparser.impl, com.google.gwt.thirdparty.streamhtmlparser.util, @@ -242,10 +141,7 @@ Export-Package: com.gargoylesoftware.htmlunit, com.google.gwt.user.tools.util, com.google.gwt.useragent.client, com.google.gwt.useragent.rebind, - com.google.gwt.util, com.google.gwt.util.regexfilter, - com.google.gwt.util.tools, - com.google.gwt.util.tools.shared, com.google.gwt.validation.client, com.google.gwt.validation.client.constraints, com.google.gwt.validation.client.impl, @@ -284,266 +180,8 @@ Export-Package: com.gargoylesoftware.htmlunit, com.google.web.bindery.requestfactory.vm, com.google.web.bindery.requestfactory.vm.impl, com.google.web.bindery.requestfactory.vm.testing, - com.ibm.icu.impl, - com.ibm.icu.impl.data, - com.ibm.icu.impl.duration, - com.ibm.icu.impl.duration.impl, - com.ibm.icu.impl.locale, - com.ibm.icu.lang, - com.ibm.icu.math, - com.ibm.icu.text, - com.ibm.icu.util, - com.steadystate.css.dom, - com.steadystate.css.parser, - com.steadystate.css.parser.selectors, - com.steadystate.css.sac, - com.steadystate.css.userdata, - java_cup, - java_cup.anttask, - java_cup.runtime, - net.sourceforge.htmlunit.corejs.classfile, - net.sourceforge.htmlunit.corejs.javascript, - net.sourceforge.htmlunit.corejs.javascript.annotations, - net.sourceforge.htmlunit.corejs.javascript.ast, - net.sourceforge.htmlunit.corejs.javascript.debug, - net.sourceforge.htmlunit.corejs.javascript.jdk13, - net.sourceforge.htmlunit.corejs.javascript.jdk15, - net.sourceforge.htmlunit.corejs.javascript.json, - net.sourceforge.htmlunit.corejs.javascript.optimizer, - net.sourceforge.htmlunit.corejs.javascript.regexp, - net.sourceforge.htmlunit.corejs.javascript.serialize, - net.sourceforge.htmlunit.corejs.javascript.tools, - net.sourceforge.htmlunit.corejs.javascript.tools.debugger, - net.sourceforge.htmlunit.corejs.javascript.tools.debugger.treetable, - net.sourceforge.htmlunit.corejs.javascript.tools.shell, - net.sourceforge.htmlunit.corejs.javascript.xml, - org.apache.bcel, - org.apache.bcel.classfile, - org.apache.bcel.generic, - org.apache.bcel.util, - org.apache.bcel.verifier, - org.apache.bcel.verifier.exc, - org.apache.bcel.verifier.statics, - org.apache.bcel.verifier.structurals, - org.apache.commons.codec, - org.apache.commons.codec.binary, - org.apache.commons.codec.digest, - org.apache.commons.codec.language, - org.apache.commons.codec.net, - org.apache.commons.collections, - org.apache.commons.collections.bag, - org.apache.commons.collections.bidimap, - org.apache.commons.collections.buffer, - org.apache.commons.collections.collection, - org.apache.commons.collections.comparators, - org.apache.commons.collections.functors, - org.apache.commons.collections.iterators, - org.apache.commons.collections.keyvalue, - org.apache.commons.collections.list, - org.apache.commons.collections.map, - org.apache.commons.collections.set, - org.apache.commons.el, - org.apache.commons.el.parser, - org.apache.commons.io, - org.apache.commons.io.comparator, - org.apache.commons.io.filefilter, - org.apache.commons.io.input, - org.apache.commons.io.output, - org.apache.commons.logging, - org.apache.commons.logging.impl, - org.apache.html.dom, - org.apache.http, - org.apache.http.annotation, - org.apache.http.auth, - org.apache.http.auth.params, - org.apache.http.client, - org.apache.http.client.entity, - org.apache.http.client.methods, - org.apache.http.client.params, - org.apache.http.client.protocol, - org.apache.http.client.utils, - org.apache.http.conn, - org.apache.http.conn.params, - org.apache.http.conn.routing, - org.apache.http.conn.scheme, - org.apache.http.conn.ssl, - org.apache.http.conn.util, - org.apache.http.cookie, - org.apache.http.cookie.params, - org.apache.http.entity, - org.apache.http.entity.mime, - org.apache.http.entity.mime.content, - org.apache.http.impl, - org.apache.http.impl.auth, - org.apache.http.impl.client, - org.apache.http.impl.conn, - org.apache.http.impl.conn.tsccm, - org.apache.http.impl.cookie, - org.apache.http.impl.entity, - org.apache.http.impl.io, - org.apache.http.io, - org.apache.http.message, - org.apache.http.params, - org.apache.http.protocol, - org.apache.http.util, - org.apache.james.mime4j, - org.apache.james.mime4j.codec, - org.apache.james.mime4j.descriptor, - org.apache.james.mime4j.field, - org.apache.james.mime4j.field.address, - org.apache.james.mime4j.field.address.parser, - org.apache.james.mime4j.field.contentdisposition.parser, - org.apache.james.mime4j.field.contenttype.parser, - org.apache.james.mime4j.field.datetime, - org.apache.james.mime4j.field.datetime.parser, - org.apache.james.mime4j.field.language.parser, - org.apache.james.mime4j.field.mimeversion.parser, - org.apache.james.mime4j.field.structured.parser, - org.apache.james.mime4j.io, - org.apache.james.mime4j.message, - org.apache.james.mime4j.parser, - org.apache.james.mime4j.storage, - org.apache.james.mime4j.util, - org.apache.jasper, - org.apache.jasper.compiler, - org.apache.jasper.compiler.tagplugin, - org.apache.jasper.runtime, - org.apache.jasper.security, - org.apache.jasper.servlet, - org.apache.jasper.tagplugins.jstl, - org.apache.jasper.util, - org.apache.jasper.xmlparser, - org.apache.regexp, - org.apache.tapestry.util.text, - org.apache.tools.ant, - org.apache.tools.ant.filters, - org.apache.tools.ant.filters.util, - org.apache.tools.ant.helper, - org.apache.tools.ant.input, - org.apache.tools.ant.listener, - org.apache.tools.ant.loader, - org.apache.tools.ant.taskdefs, - org.apache.tools.ant.taskdefs.compilers, - org.apache.tools.ant.taskdefs.condition, - org.apache.tools.ant.taskdefs.cvslib, - org.apache.tools.ant.taskdefs.email, - org.apache.tools.ant.taskdefs.rmic, - org.apache.tools.ant.types, - org.apache.tools.ant.types.mappers, - org.apache.tools.ant.types.resolver, - org.apache.tools.ant.types.selectors, - org.apache.tools.ant.types.selectors.modifiedselector, - org.apache.tools.ant.util, - org.apache.tools.ant.util.facade, - org.apache.tools.ant.util.regexp, - org.apache.tools.bzip2, - org.apache.tools.mail, - org.apache.tools.tar, - org.apache.tools.zip, - org.apache.wml, - org.apache.wml.dom, - org.apache.xalan, - org.apache.xalan.client, - org.apache.xalan.extensions, - org.apache.xalan.lib, - org.apache.xalan.lib.sql, - org.apache.xalan.processor, - org.apache.xalan.res, - org.apache.xalan.serialize, - org.apache.xalan.templates, - org.apache.xalan.trace, - org.apache.xalan.transformer, - org.apache.xalan.xslt, - org.apache.xalan.xsltc, - org.apache.xalan.xsltc.cmdline, - org.apache.xalan.xsltc.cmdline.getopt, - org.apache.xalan.xsltc.compiler, - org.apache.xalan.xsltc.compiler.util, - org.apache.xalan.xsltc.dom, - org.apache.xalan.xsltc.runtime, - org.apache.xalan.xsltc.runtime.output, - org.apache.xalan.xsltc.trax, - org.apache.xalan.xsltc.util, - org.apache.xerces.dom, - org.apache.xerces.dom.events, - org.apache.xerces.dom3.as, - org.apache.xerces.impl, - org.apache.xerces.impl.dtd, - org.apache.xerces.impl.dtd.models, - org.apache.xerces.impl.dv, - org.apache.xerces.impl.dv.dtd, - org.apache.xerces.impl.dv.util, - org.apache.xerces.impl.dv.xs, - org.apache.xerces.impl.io, - org.apache.xerces.impl.msg, - org.apache.xerces.impl.validation, - org.apache.xerces.impl.xpath, - org.apache.xerces.impl.xpath.regex, - org.apache.xerces.impl.xs, - org.apache.xerces.impl.xs.identity, - org.apache.xerces.impl.xs.models, - org.apache.xerces.impl.xs.opti, - org.apache.xerces.impl.xs.traversers, - org.apache.xerces.impl.xs.util, - org.apache.xerces.jaxp, - org.apache.xerces.jaxp.datatype, - org.apache.xerces.jaxp.validation, - org.apache.xerces.parsers, - org.apache.xerces.util, - org.apache.xerces.xinclude, - org.apache.xerces.xni, - org.apache.xerces.xni.grammars, - org.apache.xerces.xni.parser, - org.apache.xerces.xpointer, - org.apache.xerces.xs, - org.apache.xerces.xs.datatypes, - org.apache.xml.dtm, - org.apache.xml.dtm.ref, - org.apache.xml.dtm.ref.dom2dtm, - org.apache.xml.dtm.ref.sax2dtm, - org.apache.xml.res, - org.apache.xml.serialize, - org.apache.xml.serializer, - org.apache.xml.serializer.dom3, - org.apache.xml.serializer.utils, - org.apache.xml.utils, - org.apache.xml.utils.res, - org.apache.xmlcommons, - org.apache.xpath, - org.apache.xpath.axes, - org.apache.xpath.compiler, - org.apache.xpath.domapi, - org.apache.xpath.functions, - org.apache.xpath.jaxp, - org.apache.xpath.objects, - org.apache.xpath.operations, - org.apache.xpath.patterns, - org.apache.xpath.res, - org.cyberneko.html, - org.cyberneko.html.filters, - org.cyberneko.html.parsers, - org.cyberneko.html.xercesbridge, - org.eclipse.jdt.core, - org.eclipse.jdt.core.compiler, - org.eclipse.jdt.core.compiler.batch, - org.eclipse.jdt.internal.antadapter, - org.eclipse.jdt.internal.compiler, - org.eclipse.jdt.internal.compiler.ast, - org.eclipse.jdt.internal.compiler.batch, - org.eclipse.jdt.internal.compiler.classfmt, - org.eclipse.jdt.internal.compiler.codegen, - org.eclipse.jdt.internal.compiler.env, - org.eclipse.jdt.internal.compiler.flow, - org.eclipse.jdt.internal.compiler.impl, - org.eclipse.jdt.internal.compiler.lookup, - org.eclipse.jdt.internal.compiler.parser, - org.eclipse.jdt.internal.compiler.parser.diagnose, - org.eclipse.jdt.internal.compiler.problem, - org.eclipse.jdt.internal.compiler.util, - org.eclipse.jdt.internal.core.util, org.hibernate.validator, - org.hibernate.validator.engine, - org.jdesktop.swingworker + org.hibernate.validator.engine Require-Bundle: javax.validation;bundle-version="1.0.0" Import-Package: javax.servlet;version="2.6.0", javax.servlet.http;version="2.6.0" diff --git a/java/com.google.gwt.osgi/build.properties b/java/com.google.gwt.osgi/build.properties index 6c4eae4a192..551d4a7a498 100755 --- a/java/com.google.gwt.osgi/build.properties +++ b/java/com.google.gwt.osgi/build.properties @@ -1,4 +1,3 @@ bin.includes = META-INF/,\ .,\ - lib/gwt-dev.jar,\ lib/gwt-user.jar diff --git a/java/com.google.gwt.osgi/lib/gwt-dev.jar b/java/com.google.gwt.osgi/lib/gwt-dev.jar deleted file mode 100755 index a160825141c..00000000000 Binary files a/java/com.google.gwt.osgi/lib/gwt-dev.jar and /dev/null differ diff --git a/java/com.sap.sailing.gwt.ui/WEB-INF/lib/gwt-servlet.jar b/java/com.google.gwt.osgi/lib/gwt-servlet.jar similarity index 100% rename from java/com.sap.sailing.gwt.ui/WEB-INF/lib/gwt-servlet.jar rename to java/com.google.gwt.osgi/lib/gwt-servlet.jar diff --git a/java/com.sap.sailing.domain/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain/META-INF/MANIFEST.MF index 2d92ade4488..29e285ecbdc 100755 --- a/java/com.sap.sailing.domain/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.domain/META-INF/MANIFEST.MF @@ -30,4 +30,3 @@ Require-Bundle: com.googlecode.java-diff-utils;bundle-version="1.3.0", com.sap.sailing.domain.common, org.json.simple;bundle-version="1.1.0", com.sap.sailing.geocoding -Import-Package: org.apache.commons.collections.map diff --git a/java/com.sap.sailing.gwt.ui/.classpath b/java/com.sap.sailing.gwt.ui/.classpath index 486745d1300..e09700fd3f7 100755 --- a/java/com.sap.sailing.gwt.ui/.classpath +++ b/java/com.sap.sailing.gwt.ui/.classpath @@ -1,14 +1,13 @@ - - - - + + + diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF index 7ea147880c0..1e59660457e 100755 --- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF @@ -40,13 +40,13 @@ Import-Package: javax.jms;version="1.1.0", javax.servlet;version="2.6.0", javax.servlet.descriptor;version="2.6.0", javax.servlet.http;version="2.6.0", + org.apache.http.client;version="4.2.5", org.json.simple, org.json.simple.parser, org.osgi.framework, org.osgi.util.tracker Web-ContextPath: /gwt Bundle-ClassPath: WEB-INF/classes/, - WEB-INF/lib/gwt-servlet.jar, WEB-INF/lib/gwt-maps-api-3.9.0-build-17.jar, WEB-INF/lib/gwt-ajaxloader.jar, WEB-INF/lib/gwt-bootstrap-2.3.2.0.jar diff --git a/java/com.sap.sailing.gwt.ui/build.properties b/java/com.sap.sailing.gwt.ui/build.properties index 9a1111b8996..82c3c7040e5 100755 --- a/java/com.sap.sailing.gwt.ui/build.properties +++ b/java/com.sap.sailing.gwt.ui/build.properties @@ -2,7 +2,6 @@ source.WEB-INF/classes/ = src/main/java,\ src/main/resources output.WEB-INF/classes/ = bin bin.includes = META-INF/,\ - WEB-INF/lib/gwt-servlet.jar,\ WEB-INF/classes/,\ WEB-INF/web.xml,\ AdminConsole.css,\ diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetLeaderboardByNameAction.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetLeaderboardByNameAction.java index 39f92564db0..a7e989f3fd3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetLeaderboardByNameAction.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/actions/GetLeaderboardByNameAction.java @@ -9,8 +9,8 @@ import com.sap.sailing.domain.common.dto.LeaderboardDTO; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sse.gwt.client.async.AsyncAction; +import com.sap.sse.gwt.client.player.Timer; /** * Performs a result adaptation from {@link IncrementalOrFullLeaderboardDTO} and {@link LeaderboardDTO}, encapsulating diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java index ee0e615612a..751ea204167 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java @@ -7,11 +7,13 @@ import java.util.Map; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.impl.Util.Pair; import com.sap.sailing.gwt.ui.adminconsole.DateAndTimeFormatterUtil; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; -import com.sap.sailing.gwt.ui.client.Timer.PlayStates; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sailing.gwt.ui.shared.MarkPassingTimesDTO; import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; +import com.sap.sse.gwt.client.player.Timer.PlayStates; public class RaceTimePanel extends TimePanel implements RaceSelectionChangeListener, RaceTimesInfoProviderListener { private final RaceTimesInfoProvider raceTimesInfoProvider; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimesCalculationUtil.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimesCalculationUtil.java index 9b44d42add0..23a928e9e0d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimesCalculationUtil.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimesCalculationUtil.java @@ -4,6 +4,7 @@ import java.util.Date; import com.sap.sailing.domain.common.impl.Util.Pair; import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; +import com.sap.sse.gwt.client.player.Timer; public class RaceTimesCalculationUtil { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SmallWindHistoryPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SmallWindHistoryPanel.java index 87289cc1904..aa7f9e09115 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SmallWindHistoryPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SmallWindHistoryPanel.java @@ -17,6 +17,7 @@ import com.sap.sailing.domain.common.dto.PositionDTO; import com.sap.sailing.gwt.ui.shared.WindDTO; import com.sap.sailing.gwt.ui.shared.WindInfoForRaceDTO; import com.sap.sailing.gwt.ui.shared.WindTrackInfoDTO; +import com.sap.sse.gwt.client.player.TimeListener; /** * Displays a bit of wind history around the time notified to this time listener. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java index 59663f7407f..8f3248af141 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimePanel.java @@ -21,13 +21,19 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RequiresResize; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; -import com.sap.sailing.gwt.ui.client.Timer.PlayStates; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialog; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.controls.slider.SliderBar; import com.sap.sse.gwt.client.controls.slider.TimeSlider; +import com.sap.sse.gwt.client.player.PlayStateListener; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.TimeRangeChangeListener; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider; +import com.sap.sse.gwt.client.player.TimeZoomChangeListener; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; +import com.sap.sse.gwt.client.player.Timer.PlayStates; public class TimePanel extends SimplePanel implements Component, TimeListener, TimeZoomChangeListener, TimeRangeChangeListener, PlayStateListener, RequiresResize { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java index fd0f97daca9..8ffbe037c96 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java @@ -30,13 +30,8 @@ import com.sap.sailing.domain.common.media.MediaTrack.MediaType; import com.sap.sailing.domain.common.media.MediaTrack.Status; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; -import com.sap.sailing.gwt.ui.client.PlayStateListener; import com.sap.sailing.gwt.ui.client.RaceTimesInfoProvider; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; -import com.sap.sailing.gwt.ui.client.Timer.PlayStates; import com.sap.sailing.gwt.ui.client.media.MediaSelectionDialog.MediaSelectionListener; import com.sap.sailing.gwt.ui.client.media.popup.PopupWindowPlayer; import com.sap.sailing.gwt.ui.client.media.popup.VideoWindowPlayer; @@ -46,6 +41,11 @@ import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer; import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; import com.sap.sailing.gwt.ui.shared.UserDTO; import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback; +import com.sap.sse.gwt.client.player.PlayStateListener; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; +import com.sap.sse.gwt.client.player.Timer.PlayStates; public class MediaSelector implements PlayStateListener, TimeListener, AsyncCallback>, MediaSelectionListener, CloseHandler, ClosingHandler { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoEmbeddedPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoEmbeddedPlayer.java index bc502e30df9..a3ccd8f26c4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoEmbeddedPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/VideoEmbeddedPlayer.java @@ -11,10 +11,10 @@ import com.google.gwt.user.client.ui.PopupPanel; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.media.popup.PopupWindowPlayer.PopupCloseListener; import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer; import com.sap.sse.gwt.client.dialog.WindowBox; +import com.sap.sse.gwt.client.player.Timer; public class VideoEmbeddedPlayer extends AbstractEmbeddedMediaPlayer implements VideoPlayer, CloseHandler, MediaSynchAdapter { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/YoutubeEmbeddedPlayer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/YoutubeEmbeddedPlayer.java index efd808b8bfb..436ded64779 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/YoutubeEmbeddedPlayer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/YoutubeEmbeddedPlayer.java @@ -11,11 +11,11 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.MediaServiceAsync; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.media.popup.PopupWindowPlayer.PopupCloseListener; import com.sap.sailing.gwt.ui.client.media.shared.AbstractMediaPlayer; import com.sap.sailing.gwt.ui.client.media.shared.VideoPlayer; import com.sap.sse.gwt.client.dialog.WindowBox; +import com.sap.sse.gwt.client.player.Timer; public class YoutubeEmbeddedPlayer extends AbstractMediaPlayer implements VideoPlayer, CloseHandler, MediaSynchAdapter { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java index b319220be70..0123c90f005 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java @@ -41,12 +41,12 @@ import com.sap.sailing.gwt.ui.client.DetailTypeFormatter; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.shared.components.AbstractLazyComponent; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; /** * A base class for a leaderboard chart showing competitor data for all race columns of a leaderboard. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java index 21ea4d3a4c5..4a5b8f03ac1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java @@ -50,13 +50,13 @@ import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.RaceSelectionProvider; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeRangeWithZoomProvider; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.shared.CompetitorRaceDataDTO; import com.sap.sailing.gwt.ui.shared.CompetitorsRaceDataDTO; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; /** * AbstractCompetitorChart is a chart that can show one sort of competitor data (e.g. current speed over ground, windward @@ -491,7 +491,7 @@ public abstract class AbstractCompetitorRaceChart zoomRange = timeRangeWithZoomProvider.getTimeZoom(); + com.sap.sse.common.Pair zoomRange = timeRangeWithZoomProvider.getTimeZoom(); onTimeZoomChanged(zoomRange.getA(), zoomRange.getB()); } else { resetMinMaxAndExtremesInterval(/* redraw */ true); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java index e700238632b..88c43dee96c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java @@ -13,18 +13,17 @@ import org.moxieapps.gwt.highcharts.client.events.ChartSelectionEvent; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.ui.SimplePanel; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.domain.common.impl.Util.Pair; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.RaceSelectionChangeListener; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.TimeRangeChangeListener; -import com.sap.sailing.gwt.ui.client.TimeRangeWithZoomProvider; -import com.sap.sailing.gwt.ui.client.TimeZoomChangeListener; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.TimeRangeChangeListener; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider; +import com.sap.sse.gwt.client.player.TimeZoomChangeListener; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; public abstract class AbstractRaceChart extends SimplePanel implements RaceSelectionChangeListener, TimeListener, TimeZoomChangeListener, TimeRangeChangeListener { @@ -137,7 +136,7 @@ public abstract class AbstractRaceChart extends SimplePanel implements RaceSelec protected void setSeriesPoints(Series series, Point[] points) { if (timeRangeWithZoomProvider.isZoomed()) { - Pair timeZoom = timeRangeWithZoomProvider.getTimeZoom(); + com.sap.sse.common.Pair timeZoom = timeRangeWithZoomProvider.getTimeZoom(); resetMinMaxAndExtremesInterval(/* redraw */ false); series.setPoints(points, false); changeMinMaxAndExtremesInterval(timeZoom.getA(), timeZoom.getB(), /* redraw */ false); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorLeaderboardChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorLeaderboardChart.java index 55cb8b401f2..9ae49c68d83 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorLeaderboardChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorLeaderboardChart.java @@ -5,9 +5,9 @@ import com.sap.sailing.gwt.ui.client.CompetitorSelectionProvider; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.Timer; public class MultiCompetitorLeaderboardChart extends AbstractCompetitorLeaderboardChart { private MultiCompetitorLeaderboardChartSettings settings; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChart.java index 2bcada11773..76eed35adc6 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChart.java @@ -7,12 +7,12 @@ import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.RaceSelectionProvider; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeRangeWithZoomProvider; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider; +import com.sap.sse.gwt.client.player.Timer; /** * MultiCompetitorRaceChart is a GWT panel that can show competitor data (e.g. current speed over ground, windward distance to diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java index e56c11b9baa..33dd2ed3a9b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java @@ -48,9 +48,6 @@ import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.RaceSelectionProvider; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeRangeWithZoomProvider; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sailing.gwt.ui.client.WindSourceTypeFormatter; @@ -58,6 +55,9 @@ import com.sap.sailing.gwt.ui.shared.WindDTO; import com.sap.sailing.gwt.ui.shared.WindInfoForRaceDTO; import com.sap.sailing.gwt.ui.shared.WindTrackInfoDTO; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; public class WindChart extends AbstractRaceChart implements Component, RequiresResize { public static final String LODA_WIND_CHART_DATA_CATEGORY = "loadWindChartData"; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java index 2bec74c62f3..f63795a06b6 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java @@ -81,9 +81,6 @@ import com.sap.sailing.gwt.ui.client.RaceTimesInfoProviderListener; import com.sap.sailing.gwt.ui.client.RequiresDataInitialization; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayStates; import com.sap.sailing.gwt.ui.client.WindSourceTypeFormatter; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; @@ -105,6 +102,9 @@ import com.sap.sailing.gwt.ui.shared.WindTrackInfoDTO; import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapAPIKey; import com.sap.sailing.gwt.ui.shared.racemap.GoogleMapStyleHelper; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayStates; public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSelectionChangeListener, RaceSelectionChangeListener, RaceTimesInfoProviderListener, TailFactory, Component, RequiresDataInitialization, RequiresResize { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractLeaderboardViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractLeaderboardViewer.java index ce21f3d339a..7efacc69f49 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractLeaderboardViewer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractLeaderboardViewer.java @@ -12,11 +12,11 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialog; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.Timer; /** * A base class for a leaderboard viewer. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java index e5f49db640b..224608c70a1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java @@ -30,12 +30,12 @@ import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants; import com.sap.sailing.gwt.ui.client.SailingService; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.URLEncoder; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings.RaceColumnSelectionStrategies; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; import com.sap.sse.gwt.client.dialog.DataEntryDialog; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; import com.sap.sse.gwt.server.GwtHttpRequestUtils; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java index af9599cc317..81102f1937b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java @@ -74,15 +74,10 @@ import com.sap.sailing.gwt.ui.client.CompetitorSelectionChangeListener; import com.sap.sailing.gwt.ui.client.CompetitorSelectionProvider; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.FlagImageResolver; -import com.sap.sailing.gwt.ui.client.PlayStateListener; import com.sap.sailing.gwt.ui.client.RaceTimesInfoProvider; import com.sap.sailing.gwt.ui.client.RaceTimesInfoProviderListener; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; -import com.sap.sailing.gwt.ui.client.Timer.PlayStates; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.client.shared.components.IsEmbeddableComponent; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; @@ -93,6 +88,11 @@ import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; import com.sap.sse.gwt.client.controls.busyindicator.BusyIndicator; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; +import com.sap.sse.gwt.client.player.PlayStateListener; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; +import com.sap.sse.gwt.client.player.Timer.PlayStates; import com.sap.sse.gwt.client.useragent.UserAgentDetails; /** @@ -1666,7 +1666,7 @@ public class LeaderboardPanel extends SimplePanel implements TimeListener, PlayS /** * The time point for which the leaderboard currently shows results. In {@link PlayModes#Replay replay mode} this is - * the {@link #timer}'s time point. In {@link PlayModes#Live live mode} the {@link #timer}'s time is quantizes to + * the {@link #timer}'s time point. In {@link PlayModes#Live live mode} the {@link #timer}'s time is quantized to * the closest full second to increase the likelihood of cache hits in the back end. */ protected Date getLeaderboardDisplayDate() { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsFactory.java index 79622cb6b7b..97a0b43286c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsFactory.java @@ -5,8 +5,8 @@ import java.util.Collections; import java.util.List; import com.sap.sailing.domain.common.DetailType; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings.RaceColumnSelectionStrategies; +import com.sap.sse.gwt.client.player.Timer.PlayModes; /** * A factory class creating leaderboard settings for different contexts (user role, live or replay mode, etc. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardViewer.java index 9bed6dabfb6..a0f9fbc0ba5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardViewer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardViewer.java @@ -11,10 +11,10 @@ import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorLeaderboardChart; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; import com.sap.sse.gwt.client.useragent.UserAgentDetails; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MetaLeaderboardViewer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MetaLeaderboardViewer.java index 23280412856..b9b900c9ce9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MetaLeaderboardViewer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MetaLeaderboardViewer.java @@ -9,10 +9,10 @@ import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorLeaderboardChart; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; import com.sap.sse.gwt.client.useragent.UserAgentDetails; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardPanel.java index d5b25b7231d..232b437b6ce 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardPanel.java @@ -22,11 +22,11 @@ import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.shared.components.AbstractLazyComponent; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.Timer; import com.sap.sse.gwt.client.useragent.UserAgentDetails; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java index 9ccb8548a31..93acdf1f2b7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java @@ -27,14 +27,14 @@ import com.sap.sailing.gwt.ui.client.RaceTimesInfoProvider; import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants; import com.sap.sailing.gwt.ui.client.SailingService; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.UserManagementService; import com.sap.sailing.gwt.ui.client.UserManagementServiceAsync; import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO; import com.sap.sailing.gwt.ui.shared.RegattaDTO; import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO; import com.sap.sailing.gwt.ui.shared.UserDTO; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; import com.sap.sse.gwt.client.useragent.UserAgentChecker; import com.sap.sse.gwt.server.GwtHttpRequestUtils; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java index f4a63895311..a11507698f5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java @@ -39,9 +39,6 @@ import com.sap.sailing.gwt.ui.client.RaceTimesInfoProvider; import com.sap.sailing.gwt.ui.client.RegattaDisplayer; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.TimeRangeWithZoomModel; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorRaceChart; import com.sap.sailing.gwt.ui.client.shared.charts.WindChart; import com.sap.sailing.gwt.ui.client.shared.charts.WindChartSettings; @@ -71,6 +68,9 @@ import com.sap.sse.common.filter.Filter; import com.sap.sse.common.filter.FilterSet; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomModel; +import com.sap.sse.gwt.client.player.Timer; import com.sap.sse.gwt.client.useragent.UserAgentDetails; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java index d92c11540fa..3372ab87d22 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java @@ -27,10 +27,6 @@ import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.TimeListener; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; -import com.sap.sailing.gwt.ui.client.Timer.PlayStates; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialog; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings; @@ -41,6 +37,10 @@ import com.sap.sailing.gwt.ui.shared.RaceGroupDTO; import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; import com.sap.sse.gwt.client.async.MarkedAsyncCallback; +import com.sap.sse.gwt.client.player.TimeListener; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; +import com.sap.sse.gwt.client.player.Timer.PlayStates; import com.sap.sse.gwt.client.useragent.UserAgentDetails; public class RegattaOverviewPanel extends SimplePanel { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java index b86e470a7c3..2155887db0a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaRaceStatesComponent.java @@ -51,7 +51,6 @@ import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.GwtJsonDeSerializer; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.client.shared.components.Component; import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent; import com.sap.sailing.gwt.ui.shared.ClickableSafeHtmlCell; @@ -64,6 +63,7 @@ import com.sap.sailing.gwt.ui.shared.RaceInfoDTO; import com.sap.sailing.gwt.ui.shared.RegattaOverviewEntryDTO; import com.sap.sailing.gwt.ui.shared.WaypointDTO; import com.sap.sse.gwt.client.async.MarkedAsyncCallback; +import com.sap.sse.gwt.client.player.Timer; /** * This component shows a table displaying the current state of races for a given event. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardGroupDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardGroupDTO.java index 5667d6cb616..b5b463d3cdd 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardGroupDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardGroupDTO.java @@ -13,7 +13,7 @@ import com.sap.sailing.domain.common.dto.NamedDTO; import com.sap.sailing.domain.common.dto.PlacemarkDTO; import com.sap.sailing.domain.common.dto.PlacemarkOrderDTO; import com.sap.sailing.domain.common.dto.RaceColumnDTO; -import com.sap.sailing.gwt.ui.client.Timer; +import com.sap.sse.gwt.client.player.Timer; public class LeaderboardGroupDTO extends NamedDTO { private static final long serialVersionUID = -2923229069598593687L; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java index d51e99a6b7e..7938fb44445 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java @@ -6,7 +6,7 @@ import java.util.List; import com.google.gwt.user.client.rpc.IsSerializable; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.gwt.ui.client.Timer; +import com.sap.sse.gwt.client.player.Timer; public class RaceTimesInfoDTO implements IsSerializable { private RegattaAndRaceIdentifier raceIdentifier; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java index ece0baa77ee..9811f1806e8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java @@ -16,9 +16,9 @@ import com.sap.sailing.domain.common.Mile; import com.sap.sailing.domain.common.Named; import com.sap.sailing.domain.common.dto.PositionDTO; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldGenParamsDTO; +import com.sap.sse.gwt.client.player.Timer; /** * This class implements the layer which displays the optimal path on the path. Currently there is a single path to be diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java index 74947218eab..fa668523a9a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java @@ -6,9 +6,9 @@ import java.util.List; import java.util.logging.Logger; import com.google.gwt.maps.client.MapWidget; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldGenParamsDTO; +import com.sap.sse.gwt.client.player.Timer; public class ReplayPathCanvasOverlay extends PathCanvasOverlay { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java index ebe5055a19c..ade26008d08 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMainPanel.java @@ -48,10 +48,6 @@ import com.sap.sailing.gwt.ui.client.SimulatorServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.TimePanel; import com.sap.sailing.gwt.ui.client.TimePanelSettings; -import com.sap.sailing.gwt.ui.client.TimeRangeWithZoomModel; -import com.sap.sailing.gwt.ui.client.TimeRangeWithZoomProvider; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.shared.BoatClassDTOsAndNotificationMessage; import com.sap.sailing.gwt.ui.shared.PolarDiagramDTOAndNotificationMessage; import com.sap.sailing.gwt.ui.shared.SimulatorUISelectionDTO; @@ -62,6 +58,10 @@ import com.sap.sailing.gwt.ui.simulator.windpattern.WindPatternSetting; import com.sap.sailing.simulator.util.SailingSimulatorConstants; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; import com.sap.sse.gwt.client.controls.slider.SliderBar; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomModel; +import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; public class SimulatorMainPanel extends SimplePanel { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java index 899236711f6..990d28e255b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java @@ -40,7 +40,6 @@ import com.sap.sailing.gwt.ui.client.SimulatorServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.client.TimePanel; import com.sap.sailing.gwt.ui.client.TimePanelSettings; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.PathDTO; import com.sap.sailing.gwt.ui.shared.SimulatorResultsDTO; import com.sap.sailing.gwt.ui.shared.SimulatorUISelectionDTO; @@ -54,6 +53,7 @@ import com.sap.sailing.gwt.ui.simulator.util.SimulatorResources; import com.sap.sailing.gwt.ui.simulator.windpattern.WindPatternDisplay; import com.sap.sailing.simulator.util.SailingSimulatorConstants; import com.sap.sse.gwt.client.controls.busyindicator.SimpleBusyIndicator; +import com.sap.sse.gwt.client.player.Timer; /** * This class implements simulation visualization using overlays on top of a Google maps widget diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/TimeListenerWithStoppingCriteria.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/TimeListenerWithStoppingCriteria.java index 3bd80d0e683..bd6d52a4991 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/TimeListenerWithStoppingCriteria.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/TimeListenerWithStoppingCriteria.java @@ -3,7 +3,7 @@ */ package com.sap.sailing.gwt.ui.simulator; -import com.sap.sailing.gwt.ui.client.TimeListener; +import com.sap.sse.gwt.client.player.TimeListener; /** * A time listener that can be asked whether the timer shall be stopped. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java index b7b1d266cfe..11e003fe135 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindFieldCanvasOverlay.java @@ -15,12 +15,12 @@ import com.google.gwt.canvas.dom.client.Context2d; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.maps.client.MapWidget; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldDTO; import com.sap.sailing.gwt.ui.shared.WindFieldGenParamsDTO; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sailing.gwt.ui.simulator.util.ToolTip; +import com.sap.sse.gwt.client.player.Timer; /** * A google map overlay based on a HTML5 canvas for drawing a wind field. The overlay covers the whole map and displays diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindGridCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindGridCanvasOverlay.java index 83630d902b8..a5ec6af5430 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindGridCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindGridCanvasOverlay.java @@ -20,11 +20,11 @@ import com.google.gwt.maps.client.base.LatLng; import com.google.gwt.maps.client.base.Point; import com.sap.sailing.domain.common.dto.PositionDTO; import com.sap.sailing.domain.common.impl.Util.Pair; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldDTO; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sailing.gwt.ui.simulator.util.WindGridColorPalette; +import com.sap.sse.gwt.client.player.Timer; /** * A google map overlay based on a HTML5 canvas for representing a wind field as a heat map. The overlay covers the diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineCanvasOverlay.java index 863fc8bb640..14f8e0ae6f8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineCanvasOverlay.java @@ -17,10 +17,10 @@ import com.google.gwt.maps.client.MapWidget; import com.google.gwt.maps.client.base.LatLng; import com.google.gwt.maps.client.base.Point; import com.sap.sailing.domain.common.dto.PositionDTO; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.WindLinesDTO; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sailing.gwt.ui.simulator.util.LineSegment; +import com.sap.sse.gwt.client.player.Timer; public class WindLineCanvasOverlay extends FullCanvasOverlay implements TimeListenerWithStoppingCriteria { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java index f2edc2e15e6..c1a7a3799d8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindLineGuidesCanvasOverlay.java @@ -17,11 +17,11 @@ import com.google.gwt.maps.client.base.LatLng; import com.google.gwt.maps.client.base.Point; import com.sap.sailing.domain.common.dto.PositionDTO; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldDTO; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; import com.sap.sailing.gwt.ui.simulator.util.ToolTip; +import com.sap.sse.gwt.client.player.Timer; /** * A google map overlay based on a HTML5 canvas for drawing a wind field. The overlay covers the whole map and displays diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindStreamletsCanvasOverlay.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindStreamletsCanvasOverlay.java old mode 100644 new mode 100755 index fdfee55c317..513b95d1e52 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindStreamletsCanvasOverlay.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/WindStreamletsCanvasOverlay.java @@ -10,11 +10,11 @@ import com.google.gwt.json.client.JSONNumber; import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONString; import com.google.gwt.maps.client.base.LatLng; -import com.sap.sailing.gwt.ui.client.Timer; import com.sap.sailing.gwt.ui.shared.SimulatorWindDTO; import com.sap.sailing.gwt.ui.shared.WindFieldDTO; import com.sap.sailing.gwt.ui.shared.WindFieldGenParamsDTO; import com.sap.sailing.gwt.ui.simulator.racemap.FullCanvasOverlay; +import com.sap.sse.gwt.client.player.Timer; /** * A google map overlay based on a HTML5 canvas for drawing a wind field. The overlay covers the whole map and displays diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java index affcc081eb7..84d99343601 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/EventOverviewPanel.java @@ -46,11 +46,11 @@ import com.sap.sailing.gwt.ui.adminconsole.LeaderboardConfigPanel.AnchorCell; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.URLEncoder; import com.sap.sailing.gwt.ui.shared.EventDTO; import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; /** * An overview panel for sailing events diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java index 2974c995303..5595d7ba266 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java @@ -44,12 +44,12 @@ import com.sap.sailing.gwt.ui.adminconsole.LeaderboardConfigPanel.AnchorCell; import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.URLEncoder; import com.sap.sailing.gwt.ui.client.shared.components.CollapsablePanel; import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO; import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; /** * diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java index 8a9d41101df..b407f7fb492 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java @@ -39,14 +39,14 @@ import com.sap.sailing.gwt.ui.client.ErrorReporter; import com.sap.sailing.gwt.ui.client.HasWelcomeWidget; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.client.shared.panels.WelcomeWidget; import com.sap.sailing.gwt.ui.raceboard.RaceBoardViewConfiguration; import com.sap.sailing.gwt.ui.shared.LeaderboardGroupDTO; import com.sap.sailing.gwt.ui.shared.RegattaDTO; import com.sap.sailing.gwt.ui.shared.SeriesDTO; import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidget { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java index 720ef8e950a..518372b752e 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java @@ -24,8 +24,6 @@ import com.sap.sailing.gwt.ui.client.RaceTimesInfoProvider; import com.sap.sailing.gwt.ui.client.RaceTimesInfoProviderListener; import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.client.Timer; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings; import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettingsFactory; @@ -33,6 +31,8 @@ import com.sap.sailing.gwt.ui.raceboard.RaceBoardPanel; import com.sap.sailing.gwt.ui.raceboard.RaceBoardViewConfiguration; import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; import com.sap.sse.gwt.client.async.AsyncActionsExecutor; +import com.sap.sse.gwt.client.player.Timer; +import com.sap.sse.gwt.client.player.Timer.PlayModes; import com.sap.sse.gwt.client.useragent.UserAgentDetails; public class TVViewController implements RaceTimesInfoProviderListener { diff --git a/java/com.sap.sse.common/META-INF/MANIFEST.MF b/java/com.sap.sse.common/META-INF/MANIFEST.MF index 14940e7945c..0e45d756c65 100644 --- a/java/com.sap.sse.common/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.common/META-INF/MANIFEST.MF @@ -5,4 +5,5 @@ Bundle-SymbolicName: com.sap.sse.common Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: com.sap.sse.common.filter +Export-Package: com.sap.sse.common, + com.sap.sse.common.filter diff --git a/java/com.sap.sse.common/src/com/sap/sse/common/Dummy.java b/java/com.sap.sse.common/src/com/sap/sse/common/Dummy.java deleted file mode 100644 index b4937cc8499..00000000000 --- a/java/com.sap.sse.common/src/com/sap/sse/common/Dummy.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.sap.sse.common; - -public class Dummy { - -} diff --git a/java/com.sap.sse.common/src/com/sap/sse/common/Pair.java b/java/com.sap.sse.common/src/com/sap/sse/common/Pair.java new file mode 100644 index 00000000000..1226e4c34e3 --- /dev/null +++ b/java/com.sap.sse.common/src/com/sap/sse/common/Pair.java @@ -0,0 +1,60 @@ +package com.sap.sse.common; + +import java.io.Serializable; + +public class Pair implements Serializable { + private static final long serialVersionUID = 814998330023824400L; + + private A a; + + private B b; + + private transient int hashCode; + + @SuppressWarnings("unused") // required for some serialization frameworks such as GWT RPC + private Pair() {} + + public Pair( A a, B b ) { + this.a = a; + this.b = b; + hashCode = 0; + } + + public A getA( ) { + return a; + } + + public B getB( ) { + return b; + } + + @Override + public int hashCode( ) { + if ( hashCode == 0 ) { + hashCode = 17; + hashCode = 37 * hashCode + ( a != null ? a.hashCode( ) : 0 ); + hashCode = 37 * hashCode + ( b != null ? b.hashCode( ) : 0 ); + } + return hashCode; + } + + @Override + public boolean equals( Object obj ) { + boolean result; + if ( this == obj ) { + result = true; + } else if ( obj instanceof Pair ) { + Pair pair = (Pair) obj; + result = ( this.a != null && this.a.equals( pair.a ) || this.a == null && pair.a == null ) && ( this.b != null && this.b.equals( pair.b ) || this.b == null && pair.b == null ); + } else { + result = false; + } + return result; + } + + @Override + public String toString( ) { + return "[" + (a==null?"null":a.toString( )) + ", " + + (b==null?"null":b.toString( )) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } +} diff --git a/java/com.sap.sse.common/src/com/sap/sse/common/Triple.java b/java/com.sap.sse.common/src/com/sap/sse/common/Triple.java new file mode 100644 index 00000000000..57bab40fede --- /dev/null +++ b/java/com.sap.sse.common/src/com/sap/sse/common/Triple.java @@ -0,0 +1,67 @@ +package com.sap.sse.common; + +import java.io.Serializable; + +public class Triple implements Serializable { + private static final long serialVersionUID = 6906848859104077300L; + + private A a; + + private B b; + + private C c; + + private transient int hashCode; + + @SuppressWarnings("unused") // required for some serialization frameworks such as GWT RPC + private Triple() {} + + public Triple( A a, B b, C c ) { + this.a = a; + this.b = b; + this.c = c; + hashCode = 0; + } + + public A getA( ) { + return a; + } + + public B getB( ) { + return b; + } + + public C getC( ) { + return c; + } + + @Override + public int hashCode( ) { + if ( hashCode == 0 ) { + hashCode = 17; + hashCode = 37 * hashCode + ( a != null ? a.hashCode( ) : 0 ); + hashCode = 37 * hashCode + ( b != null ? b.hashCode( ) : 0 ); + hashCode = 37 * hashCode + ( c != null ? c.hashCode( ) : 0 ); + } + return hashCode; + } + + @Override + public boolean equals( Object obj ) { + boolean result; + if ( this == obj ) { + result = true; + } else if ( obj instanceof Triple ) { + Triple thrice = (Triple) obj; + result = ( this.a != null && this.a.equals( thrice.a ) || this.a == null && thrice.a == null ) && ( this.b != null && this.b.equals( thrice.b ) || this.b == null && thrice.b == null ) && ( this.c != null && this.c.equals( thrice.c ) || this.c == null && thrice.c == null ); + } else { + result = false; + } + return result; + } + + @Override + public String toString( ) { + return "[" + a + ", " + b + ", " + c + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } +} diff --git a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF index 57ad84c74ee..c35dc8e1e78 100755 --- a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: com.sap.sse.gwt Bundle-Version: 1.0.0.qualifier Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0" +Require-Bundle: com.google.gwt.osgi;bundle-version="2.6.0", + com.sap.sse.common;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Import-Package: javax.servlet;version="2.6.0", javax.servlet.http;version="2.6.0", @@ -20,6 +21,7 @@ Export-Package: com.sap.sse.gwt.client, com.sap.sse.gwt.client.controls.busyindicator, com.sap.sse.gwt.client.controls.slider, com.sap.sse.gwt.client.dialog, + com.sap.sse.gwt.client.player, com.sap.sse.gwt.client.useragent, com.sap.sse.gwt.server, com.sap.sse.gwt.shared diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/PlayStateListener.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/PlayStateListener.java similarity index 71% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/PlayStateListener.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/PlayStateListener.java index 1d5e2cbc5c0..5aa87f67986 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/PlayStateListener.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/PlayStateListener.java @@ -1,7 +1,7 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; -import com.sap.sailing.gwt.ui.client.Timer.PlayModes; -import com.sap.sailing.gwt.ui.client.Timer.PlayStates; +import com.sap.sse.gwt.client.player.Timer.PlayModes; +import com.sap.sse.gwt.client.player.Timer.PlayStates; public interface PlayStateListener { /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeListener.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeListener.java similarity index 70% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeListener.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeListener.java index 73cee95c844..cabd8eef5e7 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeListener.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeListener.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Date; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeChangeListener.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeChangeListener.java similarity index 73% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeChangeListener.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeChangeListener.java index 470f317d53a..d60cced256a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeChangeListener.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeChangeListener.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Date; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeModel.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeModel.java similarity index 91% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeModel.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeModel.java index fc3423406b3..26d57a4ff32 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeModel.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeModel.java @@ -1,11 +1,11 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Arrays; import java.util.Date; import java.util.HashSet; import java.util.Set; -import com.sap.sailing.domain.common.impl.Util.Pair; +import com.sap.sse.common.Pair; public class TimeRangeModel implements TimeRangeProvider { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeProvider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeProvider.java similarity index 79% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeProvider.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeProvider.java index e946a822b76..92c3971883e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeProvider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeProvider.java @@ -1,8 +1,8 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Date; -import com.sap.sailing.domain.common.impl.Util.Pair; +import com.sap.sse.common.Pair; public interface TimeRangeProvider { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeWithZoomModel.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeWithZoomModel.java similarity index 93% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeWithZoomModel.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeWithZoomModel.java index a08daf85038..c29e9980ccf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeWithZoomModel.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeWithZoomModel.java @@ -1,11 +1,11 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Arrays; import java.util.Date; import java.util.HashSet; import java.util.Set; -import com.sap.sailing.domain.common.impl.Util.Pair; +import com.sap.sse.common.Pair; public class TimeRangeWithZoomModel extends TimeRangeModel implements TimeRangeWithZoomProvider { private Date zoomStartTimepoint; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeWithZoomProvider.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeWithZoomProvider.java similarity index 82% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeWithZoomProvider.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeWithZoomProvider.java index 7bcd1112440..7105a6b8bc8 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeRangeWithZoomProvider.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeRangeWithZoomProvider.java @@ -1,8 +1,8 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Date; -import com.sap.sailing.domain.common.impl.Util.Pair; +import com.sap.sse.common.Pair; public interface TimeRangeWithZoomProvider extends TimeRangeProvider { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeZoomChangeListener.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeZoomChangeListener.java similarity index 78% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeZoomChangeListener.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeZoomChangeListener.java index b6f3bf7b1f6..c491060ec68 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/TimeZoomChangeListener.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/TimeZoomChangeListener.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Date; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/Timer.java similarity index 97% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java rename to java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/Timer.java index f030aba9476..2e9bf8771b0 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/Timer.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/player/Timer.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.ui.client; +package com.sap.sse.gwt.client.player; import java.util.Date; import java.util.HashSet;