Skip to content

Commit

Permalink
changes to get this working
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rikkola
Rikkola committed Sep 30, 2020
1 parent 563f0f1 commit 1d28751
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 46 deletions.
98 changes: 98 additions & 0 deletions org.jresearch.gwt.time.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="gwt" name="GWT">
<configuration>
<setting name="gwtSdkUrl" value="file://$MAVEN_REPOSITORY$/com/google/gwt/gwt-dev/2.8.2/" />
<setting name="gwtSdkType" value="maven" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/gwt-maven-plugin" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
<orderEntry type="library" name="Maven: org.jresearch.gwt.time:org.jresearch.gwt.time.apt.annotation:1.0.7-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.jresearch.gwtproject:typedarrays:1.2" level="project" />
<orderEntry type="library" name="Maven: org.jresearch.gwtproject.core:gwt-core:1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.elemental2:elemental2-promise:1.0.0-RC1" level="project" />
<orderEntry type="library" name="Maven: com.google.elemental2:elemental2-dom:1.0.0-RC1" level="project" />
<orderEntry type="library" name="Maven: com.google.elemental2:elemental2-core:1.0.0-RC1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.jresearch.gwtproject.nio:gwt-nio:0.1" level="project" />
<orderEntry type="library" name="Maven: org.jresearch.gwtproject.xhr:gwt-xhr:1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.jsinterop:jsinterop-annotations:1.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.gwt:gwt-user:2.8.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.jsinterop:jsinterop-annotations:sources:1.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.validation:validation-api:sources:1.0.0.GA" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.w3c.css:sac:1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.gwt:gwt-dev:2.8.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-util:5.0.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:5.0.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:5.0.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: colt:colt:1.2.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: ant:ant:1.6.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.ibm.icu:icu4j:50.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: tapestry:tapestry:4.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sourceforge.htmlunit:htmlunit:2.19" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: xalan:xalan:2.7.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: xalan:serializer:2.7.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpmime:4.5.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.13" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.17" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.sourceforge.cssparser:cssparser:0.9.18" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-webapp:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-xml:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-servlet:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-security:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-servlets:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-continuation:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-http:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-annotations:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-plus:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-jndi:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:apache-jsp:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-server:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty.toolchain:jetty-schemas:3.1.M0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mortbay.jasper:apache-jsp:8.0.9.M3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mortbay.jasper:apache-el:8.5.49" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-util:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jetty:jetty-io:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.2.14.v20151106" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.2.14.v20151106" level="project" />
<orderEntry type="library" name="Maven: com.google.jsinterop:base:1.0.0-RC1" level="project" />
<orderEntry type="library" name="Maven: org.immutables:value-annotations:2.8.3" level="project" />
</component>
</module>
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.jresearch.dominokit</groupId>
<artifactId>domino-slf4j-logger</artifactId>
<version>${gwt-slf4j.ver}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.jresearch.dominokit</groupId>-->
<!-- <artifactId>domino-slf4j-logger</artifactId>-->
<!-- <version>${gwt-slf4j.ver}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.jresearch.gwtproject.nio</groupId>
<artifactId>gwt-nio</artifactId>
Expand Down
17 changes: 0 additions & 17 deletions src/main/java/java/time/zone/Providers.java
View file

This file was deleted.

12 changes: 6 additions & 6 deletions src/main/java/org/jresearch/threetenbp/gwt/client/Support.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.jresearch.threetenbp.gwt.client;

import java.nio.ByteBuffer;
import java.time.zone.Providers;
import java.time.zone.ZoneRulesProvider;
//import java.time.zone.Providers;
//import java.time.zone.ZoneRulesProvider;
import java.util.Locale;
import java.util.stream.Stream;

Expand Down Expand Up @@ -60,8 +60,8 @@ public void onReadyStateChange(XMLHttpRequest xhr) {
LOGGER.trace("tz asynch initialization");
ArrayBuffer buffer = Js.cast(xhr.getResponseArrayBuffer());
ByteBuffer data = TypedArrayHelper.wrap(buffer);
ZoneRulesProvider provider = Providers.of(data);
ZoneRulesProvider.registerProvider(provider);
// ZoneRulesProvider provider = Providers.of(data);
// ZoneRulesProvider.registerProvider(provider);
tzTnitialized = true;
}
} else {
Expand All @@ -82,8 +82,8 @@ public static void initTzData() {
String tzData = bundle.tzdbEncoded().getText();
ArrayBuffer buffer = Support.decodeArrayBuffer(tzData);
ByteBuffer data = TypedArrayHelper.wrap(buffer);
ZoneRulesProvider provider = Providers.of(data);
ZoneRulesProvider.registerProvider(provider);
// ZoneRulesProvider provider = Providers.of(data);
// ZoneRulesProvider.registerProvider(provider);
tzTnitialized = true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/super/java/time/format/DateTimeFormatterBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3394,7 +3394,7 @@ public boolean print(DateTimePrintContext context, StringBuilder buf) {

@Override
public int parse(DateTimeParseContext context, CharSequence text, int position) {
LOGGER.debug("parse {} from position {} in context {}", text, position, context);
// LOGGER.debug("parse {} from position {} in context {}", text, position, context);
// this is a poor implementation that handles some but not all of the spec
// JDK8 has a lot of extra information here
Map<String, String> ids = new TreeMap<String, String>(LENGTH_COMPARATOR);
Expand Down
2 changes: 1 addition & 1 deletion src/main/super/java/time/format/SimpleDateTimeTextProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public int compare(Entry<String, Long> obj1, Entry<String, Long> obj2) {
//-----------------------------------------------------------------------
@Override
public String getText(TemporalField field, long value, TextStyle style, Locale locale) {
LOGGER.trace("Return text for field {}, value {}, style {}, locale {}", field, value, style, locale);
// LOGGER.trace("Return text for field {}, value {}, style {}, locale {}", field, value, style, locale);
Object store = findStore(field, locale);
if (store instanceof LocaleStore) {
return ((LocaleStore) store).getText(value, style);
Expand Down
15 changes: 0 additions & 15 deletions src/main/super/java/time/zone/Providers.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/super/java/time/zone/TzdbZoneRulesProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ ZoneRules createRule(short index) throws Exception {
ZoneRules rule = ruleData[index];
if (rule == null) {
ArrayBuffer arrayBuffer = encodeRuleData[index];
rule = (ZoneRules) Ser.read(ByteBuffer.wrapArrayBuffer(arrayBuffer));
rule = (ZoneRules) Ser.read(org.gwtproject.nio.TypedArrayHelper.wrap(arrayBuffer));
ruleData[index] = rule;
encodeRuleData[index] = null;
}
Expand Down

0 comments on commit 1d28751

Please sign in to comment.