diff --git a/README.md b/README.md index 92a779c17..6188ae9e8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![License](http://img.shields.io/:license-apache-blue.svg) [![Gitter](https://badges.gitter.im/davidsowerby/krail.svg)](https://gitter.im/davidsowerby/krail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -[![Build Status](https://travis-ci.org/davidsowerby/krailkrail.svg?branch=master)](https://travis-ci.org/davidsowerby/krail) +[![Build Status](https://travis-ci.org/davidsowerby/krail.svg?branch=master)](https://travis-ci.org/davidsowerby/krail) [![Coverage Status](https://coveralls.io/repos/github/davidsowerby/krail/badge.svg?branch=master)](https://coveralls.io/github/davidsowerby/krail?branch=master) Krail provides a framework for rapid Java web development by combining Vaadin, Guice, Apache Shiro, Apache Commons Configuration and others. For more information, see the comprehensive [Tutorial](http://krail.readthedocs.org/en/master/), which also makes a reasonable demo. (You can clone directly from the [Tutorial repo](https://github.com/davidsowerby/krail-tutorial)) diff --git a/src/main/java/uk/q3c/krail/core/view/Grid3x3ViewBase.java b/src/main/java/uk/q3c/krail/core/view/Grid3x3ViewBase.java index d7edaac76..5dd9fec75 100644 --- a/src/main/java/uk/q3c/krail/core/view/Grid3x3ViewBase.java +++ b/src/main/java/uk/q3c/krail/core/view/Grid3x3ViewBase.java @@ -23,8 +23,8 @@ import static com.google.common.base.Preconditions.checkArgument; public class Grid3x3ViewBase extends ViewBase { - private final float[] defaultColumnWidths = new float[]{1f, 1f, 1f}; - private final float[] defaultRowHeights = new float[]{1f, 1f, 1f}; + private static final float[] defaultColumnWidths = new float[]{1f, 1f, 1f}; + private static final float[] defaultRowHeights = new float[]{1f, 1f, 1f}; private GridLayout grid; @Inject diff --git a/src/test/java/uk/q3c/krail/core/navigate/StrictURIFragmentHandlerTest.java b/src/test/java/uk/q3c/krail/core/navigate/StrictURIFragmentHandlerTest.java index 880f6b538..27401f612 100644 --- a/src/test/java/uk/q3c/krail/core/navigate/StrictURIFragmentHandlerTest.java +++ b/src/test/java/uk/q3c/krail/core/navigate/StrictURIFragmentHandlerTest.java @@ -27,27 +27,27 @@ @GuiceContext({}) public class StrictURIFragmentHandlerTest { - final String view = "view1"; - final String view_ = "view1/"; - final String view_p = "view1/a=b"; - final String view_p2 = "view1/a=b/year=1970"; - final String view_p2m1 = "view1/a=b/year="; - final String view_p2m2 = "view1/a=b/=1970"; - final String view_p2m3 = "view1/a=b/1970"; - final String view_p2m5 = "view1/=b/year=1970"; - final String view_p2m6 = "view1/a=/year=1970"; - - final String subView = "view1/subView"; - final String subView_ = "view1/subView/"; - final String subView_p = "view1/subView/a=b"; - final String subView_p2 = "view1/subView/a=b/year=1970"; - final String dbl = "view//subView"; - - final String home = ""; - final String home_p = "a=b"; - final String home_p2 = "a=b/year=1970"; - - final String subView_p2_bang = "!view1/subView/a=b/year=1970"; + static final String view = "view1"; + static final String view_ = "view1/"; + static final String view_p = "view1/a=b"; + static final String view_p2 = "view1/a=b/year=1970"; + static final String view_p2m1 = "view1/a=b/year="; + static final String view_p2m2 = "view1/a=b/=1970"; + static final String view_p2m3 = "view1/a=b/1970"; + static final String view_p2m5 = "view1/=b/year=1970"; + static final String view_p2m6 = "view1/a=/year=1970"; + + static final String subView = "view1/subView"; + static final String subView_ = "view1/subView/"; + static final String subView_p = "view1/subView/a=b"; + static final String subView_p2 = "view1/subView/a=b/year=1970"; + static final String dbl = "view//subView"; + + static final String home = ""; + static final String home_p = "a=b"; + static final String home_p2 = "a=b/year=1970"; + + static final String subView_p2_bang = "!view1/subView/a=b/year=1970"; @Inject StrictURIFragmentHandler uriHandler; diff --git a/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapServiceTest.java b/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapServiceTest.java index 6674576eb..259a6a313 100644 --- a/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapServiceTest.java +++ b/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapServiceTest.java @@ -75,9 +75,9 @@ public class DefaultSitemapServiceTest { static VaadinService vaadinService; static ResourceUtils resourceUtils = new DefaultResourceUtils(); - private final int FILE_NODE_COUNT = 4; - private final int DIRECT_NODE_COUNT = 2; - private final int STANDARD_NODE_COUNT = 5; + private static final int FILE_NODE_COUNT = 4; + private static final int DIRECT_NODE_COUNT = 2; + private static final int STANDARD_NODE_COUNT = 5; @Inject DefaultSitemapService service; @Inject diff --git a/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java b/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java index 44d08eba4..a4c7dda45 100644 --- a/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java +++ b/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java @@ -60,7 +60,7 @@ public class ScopedUITest { static int connectCount; - protected final String baseUri = "http://example.com"; + protected static final String baseUri = "http://example.com"; ScopedUI ui; @Mock Navigator navigator;