You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/09/12 12:07:39 UTC
[1/2] git commit: Minor non-functional fixes:
Repository: isis
Updated Branches:
refs/heads/master 3702236b1 -> 0b52e7ae6
Minor non-functional fixes:
- javadoc
- constants
- Log the exception stack trace for better diagnostics.
- Java 7 improvements
- Use JavaScript event names without the 'on' prefix to avoid the warning from Wicket's AjaxEventBehavior
- add TODOs for potential problems
- remove casting where not needed
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1d84bb6d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1d84bb6d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1d84bb6d
Branch: refs/heads/master
Commit: 1d84bb6d19fef0a0a9b855ca5ad29b1277cadd27
Parents: c1af7b4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 8 08:59:29 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Sep 12 10:41:47 2014 +0300
----------------------------------------------------------------------
.../viewer/wicket/viewer/IsisWicketApplication.java | 2 +-
.../viewer/integration/isis/WicketServerPrototype.java | 2 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 11 +----------
.../integration/wicket/WebRequestCycleForIsis.java | 10 +++-------
.../components/ComponentFactoryRegistryDefault.java | 3 +--
.../isis/viewer/wicket/ui/ComponentFactoryAbstract.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/ComponentType.java | 4 ++--
.../viewer/wicket/ui/HeaderContributorProvider.java | 1 +
.../wicket/ui/actionresponse/ActionResultResponse.java | 6 +++---
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../wicket/ui/pages/voidreturn/VoidReturnPage.java | 2 +-
.../isis/applib/services/eventbus/EventBusService.java | 4 ++--
.../isis/core/metamodel/spec/ObjectSpecification.java | 2 +-
.../webapp/diagnostics/IsisLogOnExceptionFilter.java | 12 +++---------
.../isis/core/runtime/system/SystemConstants.java | 2 +-
.../isis/core/runtime/system/context/IsisContext.java | 2 +-
.../dom/src/main/java/dom/simple/SimpleObjects.java | 7 ++++++-
.../src/test/java/dom/simple/SimpleObjectTest_name.java | 9 +++++----
.../test/java/dom/simple/SimpleObjectsTest_create.java | 10 ++++------
.../webapp/src/main/java/webapp/SimpleApplication.java | 7 +++++--
23 files changed, 47 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index f5503ec..9499efa 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -100,7 +100,7 @@ import org.apache.isis.viewer.wicket.viewer.settings.IsisResourceSettings;
* <p>
* Its main responsibility is to allow the set of {@link ComponentFactory}s used
* to render the domain objects to be registered. This type of customisation is
- * commonplace. At a more fundamental level, also allows the {@link Page}
+ * common place. At a more fundamental level, also allows the {@link Page}
* implementation for each {@link PageType page type} to be overridden. This is
* probably less common, because CSS can also be used for this purpose.
*
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
index 42fcdb1..5878c5d 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/isis/WicketServerPrototype.java
@@ -29,7 +29,7 @@ import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
* <p>
* In {@link IsisWicketApplication} there is logic to select either this
* {@link DeploymentType} or {@link WicketServer} depending on the value of
- * Wicket's own {@link Application#getConfigurationType() configuration mode}.
+ * Wicket's own {@link org.apache.wicket.Application#getConfigurationType() configuration mode}.
*/
public class WicketServerPrototype extends DeploymentTypeWicketAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 2851202..185a15a 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -48,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
/**
* Viewer-specific implementation of {@link AuthenticatedWebSession}, which
* delegates to the Isis' configured {@link AuthenticationManager}, and which
- * also tracks threadusage (so that multiple concurrent requests are all
+ * also tracks thread usage (so that multiple concurrent requests are all
* associated with the same session).
*/
public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession implements AuthenticationSessionProvider, BreadcrumbModelProvider, BookmarkedPagesModelProvider {
@@ -92,15 +92,6 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
final List<String> roles = authenticationSession.getRoles();
return new Roles(roles.toArray(new String[] {}));
}
-
- /**
- * Simply downcasts, for convenience of callers.
- */
- @Override
- public WebClientInfo getClientInfo() {
- return (WebClientInfo) super.getClientInfo();
- }
-
// /////////////////////////////////////////////////
// Breadcrumbs and Bookmarks support
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index 051f5bc..49ff350 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -31,7 +31,6 @@ import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.PageExpiredException;
-import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
@@ -54,7 +53,7 @@ import org.apache.isis.viewer.wicket.ui.pages.mmverror.MmvErrorPage;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
/**
- * Isis-specific implementation of the Wicket's {@link WebRequestCycle},
+ * Isis-specific implementation of the Wicket's {@link RequestCycle},
* automatically opening a {@link IsisSession} at the beginning of the request
* and committing the transaction and closing the session at the end.
*/
@@ -62,15 +61,12 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
private static final Logger LOG = LoggerFactory.getLogger(WebRequestCycleForIsis.class);
- private AuthenticatedWebSessionForIsis getWebSession() {
- return (AuthenticatedWebSessionForIsis) WebSession.get();
- }
-
@Override
public synchronized void onBeginRequest(RequestCycle requestCycle) {
- final AuthenticatedWebSessionForIsis wicketSession = getWebSession();
+ final AuthenticatedWebSessionForIsis wicketSession = AuthenticatedWebSessionForIsis.get();
if (wicketSession == null) {
+ // FIXME Session.get() acts as getOrCreate so this will never be null
return;
}
final AuthenticationSession authenticationSession = wicketSession.getAuthenticationSession();
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 41d89cf..00f7a4d 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -36,7 +36,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.model.IModel;
-import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -58,7 +57,7 @@ public class ComponentFactoryRegistryDefault implements ComponentFactoryRegistry
componentFactoriesByType = Multimaps.newListMultimap(new HashMap<ComponentType, Collection<ComponentFactory>>(), new Supplier<List<ComponentFactory>>() {
@Override
public List<ComponentFactory> get() {
- return Lists.<ComponentFactory> newArrayList();
+ return Lists.newArrayList();
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
index 7839085..e018a74 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
@@ -87,7 +87,7 @@ public abstract class ComponentFactoryAbstract implements ComponentFactory {
}
/**
- * Convenenience for subclasses to call from {@link #appliesTo(IModel)}
+ * Convenience for subclasses to call from {@link #appliesTo(IModel)}
*/
protected final ApplicationAdvice appliesExclusivelyIf(final boolean b) {
return b ? ApplicationAdvice.APPLIES_EXCLUSIVELY : ApplicationAdvice.DOES_NOT_APPLY;
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
index cfea54e..732b1f8 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentType.java
@@ -140,7 +140,7 @@ public enum ComponentType {
/**
* Returns the {@link #name()} formatted as
- * {@link Strings#camelCase(String) camel case}.
+ * {@link org.apache.isis.core.commons.lang.StringExtensions#toCamelCase(String) case}.
*
* <p>
* For example, <tt>OBJECT_EDIT</tt> becomes <tt>objectEdit</tt>.
@@ -163,4 +163,4 @@ public enum ComponentType {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
index dd09543..fd9663b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/HeaderContributorProvider.java
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.wicket.ui;
import org.apache.wicket.markup.html.IHeaderContributor;
+// TODO unused. Remove ?!
public interface HeaderContributorProvider {
IHeaderContributor getHeaderContributor();
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
index 2225115..ad5bbf5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponse.java
@@ -33,8 +33,8 @@ public class ActionResultResponse {
private final ActionResultResponseHandlingStrategy handlingStrategy;
private final IRequestHandler handler;
private final PageAbstract page;
- private AjaxRequestTarget target;
- private URL url;
+ private final AjaxRequestTarget target;
+ private final URL url;
public static ActionResultResponse withHandler(IRequestHandler handler) {
return new ActionResultResponse(
@@ -89,4 +89,4 @@ public class ActionResultResponse {
public URL getUrl() {
return url;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 5f51036..e77583b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -208,7 +208,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
addCssForMetaModel();
if(!subscribers.isEmpty()) {
- addFormComponentBehavior(new AjaxFormComponentUpdatingBehavior("onchange"){
+ addFormComponentBehavior(new AjaxFormComponentUpdatingBehavior("change"){
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index d6747e7..c563f46 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -64,7 +64,7 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
final Select2Choice<EntityModel> breadcrumbChoice = new Select2Choice<EntityModel>(ID_BREADCRUMBS, entityModel);
breadcrumbChoice.add(
- new AjaxFormComponentUpdatingBehavior("onchange"){
+ new AjaxFormComponentUpdatingBehavior("change"){
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
index 2050c6f..2341f14 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
@@ -28,7 +28,7 @@
<!-- using our own copy rather than a webjars vanilla copy; see comments in PageAbstract#renderHead -->
<link href="bootstrap/css/bootstrap.css" rel="stylesheet" type="text/css"/>
- <link href="PageAbstract.css" rel="stylesheet" type="text/css" ></link>
+ <link href="PageAbstract.css" rel="stylesheet" type="text/css"/>
<link href="isis-wicket-theme/jquery-ui-1.10.2.custom.css" rel="stylesheet" type="text/css"/>
<link href="jquery.jgrowl.css" rel="stylesheet" type="text/css"/>
</wicket:link>
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 142bfff..c469418 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -84,7 +84,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
private static final String REGULAR_CASE_KEY = "isis.viewer.wicket.regularCase";
/**
- * @see http://github.com/brandonaaron/livequery
+ * @see <a href="http://github.com/brandonaaron/livequery">livequery</a>
*/
private static final JavaScriptResourceReference JQUERY_LIVEQUERY_JS = new JavaScriptResourceReference(PageAbstract.class, "jquery.livequery.js");
private static final JavaScriptResourceReference JQUERY_ISIS_WICKET_VIEWER_JS = new JavaScriptResourceReference(PageAbstract.class, "jquery.isis.wicket.viewer.js");
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
index 6bf8592..91a7451 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
@@ -40,7 +40,7 @@ public class VoidReturnPage extends PageAbstract {
private static final String ID_ACTION_NAME = "actionName";
/**
- * For use with {@link Component#setResponsePage(org.apache.wicket.Page)}
+ * For use with {@link Component#setResponsePage(org.apache.wicket.request.component.IRequestablePage)}
*/
public VoidReturnPage(final VoidModel model) {
this(model, actionNameFrom(model));
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
index 19bfe59..059b91d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
@@ -40,9 +40,9 @@ public abstract class EventBusService {
*/
public static class Noop extends EventBusService {
@Override
- public void register(Object domainObject) {};
+ public void register(Object domainObject) {}
@Override
- public void unregister(Object domainObject) {};
+ public void unregister(Object domainObject) {}
@Override
public void post(Object event) {}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index f2847ff..cc3f63e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -165,7 +165,7 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
* Returns a css class name of the specification.
*
* <p>
- * Corresponds to the {@link CssClass#value()) value} of {@link CssClassFacet};
+ * Corresponds to the {@link org.apache.isis.applib.annotation.CssClass#value()) value} of {@link CssClassFacet};
*/
String getCssClass();
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/core/metamodel/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
index 4e9d050..b195de5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
@@ -50,13 +50,7 @@ public class IsisLogOnExceptionFilter implements Filter {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
try {
chain.doFilter(request, response);
- } catch (IOException e) {
- logRequestUrl(request, e);
- throw e;
- } catch (ServletException e) {
- logRequestUrl(request, e);
- throw e;
- } catch (RuntimeException e) {
+ } catch (IOException | ServletException | RuntimeException e) {
logRequestUrl(request, e);
throw e;
}
@@ -70,9 +64,9 @@ public class IsisLogOnExceptionFilter implements Filter {
final StringBuffer buf = httpServletRequest.getRequestURL();
final String queryString = httpServletRequest.getQueryString();
if(queryString != null) {
- buf.append("?" + queryString);
+ buf.append('?').append(queryString);
}
- LOG.error("Request caused " + e.getClass().getName() + ": " + buf.toString());
+ LOG.error("Request caused " + e.getClass().getName() + ": " + buf.toString(), e);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
index f5b4513..68c7100 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
@@ -45,7 +45,7 @@ public final class SystemConstants {
* {@link IsisConfiguration}.
*
* <p>
- * Use {@link DeploymentType#valueOf(String)} to decode.
+ * Use {@link DeploymentType#lookup(String)} to decode.
*/
public static final String DEPLOYMENT_TYPE_KEY = ConfigurationConstants.ROOT + "deploymentType";
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 6b8e423..d0e9299 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -106,7 +106,7 @@ public abstract class IsisContext implements DebuggableWithTitle {
/**
* Sessions will be automatically closed.
*/
- AUTO_CLOSE;
+ AUTO_CLOSE
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
index 9fb85e6..0197445 100644
--- a/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
+++ b/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java
@@ -19,9 +19,14 @@
package dom.simple;
import java.util.List;
+
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.*;
+import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
+import org.apache.isis.applib.annotation.Bookmarkable;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Named;
@DomainService(menuOrder = "10", repositoryFor = SimpleObject.class)
public class SimpleObjects {
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
index 05b9914..46f1a15 100644
--- a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
+++ b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectTest_name.java
@@ -16,9 +16,9 @@
*/
package dom.simple;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import dom.simple.SimpleObject;
import org.junit.Before;
import org.junit.Test;
@@ -35,13 +35,14 @@ public class SimpleObjectTest_name {
@Test
public void happyCase() throws Exception {
// given
+ String name = "Foobar";
assertThat(simpleObject.getName(), is(nullValue()));
// when
- simpleObject.setName("Foobar");
+ simpleObject.setName(name);
// then
- assertThat(simpleObject.getName(), is("Foobar"));
+ assertThat(simpleObject.getName(), is(name));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
index f4ad5d3..ead1de9 100644
--- a/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
+++ b/example/application/simpleapp/dom/src/test/java/dom/simple/SimpleObjectsTest_create.java
@@ -16,10 +16,12 @@
*/
package dom.simple;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import dom.simple.SimpleObject;
+import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.jmock.auto.Mock;
@@ -27,10 +29,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-
public class SimpleObjectsTest_create {
@Rule
http://git-wip-us.apache.org/repos/asf/isis/blob/1d84bb6d/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java b/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
index 8bf985d..e8b3310 100644
--- a/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
+++ b/example/application/simpleapp/webapp/src/main/java/webapp/SimpleApplication.java
@@ -31,9 +31,11 @@ import com.google.inject.name.Names;
import com.google.inject.util.Modules;
import com.google.inject.util.Providers;
import org.apache.wicket.Session;
+import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.http.WebRequest;
+
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
@@ -77,8 +79,9 @@ public class SimpleApplication extends IsisWicketApplication {
// else demo mode
final AuthenticatedWebSessionForIsis s = (AuthenticatedWebSessionForIsis) super.newSession(request, response);
- final org.apache.wicket.util.string.StringValue user = request.getRequestParameters().getParameterValue("user");
- final org.apache.wicket.util.string.StringValue password = request.getRequestParameters().getParameterValue("pass");
+ IRequestParameters requestParameters = request.getRequestParameters();
+ final org.apache.wicket.util.string.StringValue user = requestParameters.getParameterValue("user");
+ final org.apache.wicket.util.string.StringValue password = requestParameters.getParameterValue("pass");
s.signIn(user.toString(), password.toString());
return s;
}
[2/2] git commit: ISIS-872: Merge remote-tracking branch
'martin-g/minor-improvements'
Posted by da...@apache.org.
ISIS-872: Merge remote-tracking branch 'martin-g/minor-improvements'
* martin-g/minor-improvements:
Minor non-functional fixes:
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0b52e7ae
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0b52e7ae
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0b52e7ae
Branch: refs/heads/master
Commit: 0b52e7ae631d03e37c18cd5290347790a7a35478
Parents: 3702236 1d84bb6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 12 10:15:38 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 12 10:15:38 2014 +0100
----------------------------------------------------------------------
.../viewer/wicket/viewer/IsisWicketApplication.java | 2 +-
.../viewer/integration/isis/WicketServerPrototype.java | 2 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 11 +----------
.../integration/wicket/WebRequestCycleForIsis.java | 10 +++-------
.../components/ComponentFactoryRegistryDefault.java | 3 +--
.../isis/viewer/wicket/ui/ComponentFactoryAbstract.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/ComponentType.java | 4 ++--
.../viewer/wicket/ui/HeaderContributorProvider.java | 1 +
.../wicket/ui/actionresponse/ActionResultResponse.java | 6 +++---
.../ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../components/widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../wicket/ui/pages/voidreturn/VoidReturnPage.java | 2 +-
.../isis/applib/services/eventbus/EventBusService.java | 4 ++--
.../isis/core/metamodel/spec/ObjectSpecification.java | 2 +-
.../webapp/diagnostics/IsisLogOnExceptionFilter.java | 12 +++---------
.../isis/core/runtime/system/SystemConstants.java | 2 +-
.../isis/core/runtime/system/context/IsisContext.java | 2 +-
.../dom/src/main/java/dom/simple/SimpleObjects.java | 7 ++++++-
.../src/test/java/dom/simple/SimpleObjectTest_name.java | 9 +++++----
.../test/java/dom/simple/SimpleObjectsTest_create.java | 10 ++++------
.../webapp/src/main/java/webapp/SimpleApplication.java | 7 +++++--
23 files changed, 47 insertions(+), 59 deletions(-)
----------------------------------------------------------------------