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 2017/09/08 19:17:47 UTC

[1/3] isis git commit: Update disable() to disabled()

Repository: isis
Updated Branches:
  refs/heads/master 258a9e9fc -> cb9c522f8


Update disable() to disabled()

At least in Apache ISIS version 1.15.0 only the method name disabled() works as described. The only other source I found is a comment in the corresponding feature request:
https://issues.apache.org/jira/browse/ISIS-142?focusedCommentId=13165135&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13165135

Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e6862012
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e6862012
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e6862012

Branch: refs/heads/master
Commit: e6862012669df189d2bc264db9b1486d44220f85
Parents: 02d0fe5
Author: gesina <ge...@pheerai.de>
Authored: Fri Sep 8 10:46:16 2017 +0200
Committer: GitHub <no...@github.com>
Committed: Fri Sep 8 10:46:16 2017 +0200

----------------------------------------------------------------------
 .../asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/e6862012/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc
index 46a0924..5a65cb3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc
@@ -1,5 +1,5 @@
 [[_rgcms_methods_reserved_disable]]
-= `disable()`
+= `disabled()`
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 :_basedir: ../../
 :_imagesdir: images/
@@ -13,7 +13,7 @@ The signature of the method is:
 
 [source,java]
 ----
-public String disable(Identifier.Type identifierType) { ... }
+public String disabled(Identifier.Type identifierType) { ... }
 ----
 
 where `Identifier.Type` is part of the Isis applib (nested static class of `o.a.i.applib.Identifier`) to distinguish between an interaction with an action, a property or an action.
@@ -24,7 +24,7 @@ For example:
 
 [source,java]
 ----
-public String disable(Identifier.Type identifierType) {
+public String disabled(Identifier.Type identifierType) {
     return !calendarService.isOfficeHours(clock.today()
             ? "Cannot modify objects outside of office hours"
             : null;


[2/3] isis git commit: Merge branch 'patch-1' of https://github.com/gesina/isis into ISIS-1712_pr-91

Posted by da...@apache.org.
Merge branch 'patch-1' of https://github.com/gesina/isis into ISIS-1712_pr-91


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/41c6081f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/41c6081f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/41c6081f

Branch: refs/heads/master
Commit: 41c6081fb306483c836f31d199301111d7c964af
Parents: 258a9e9 e686201
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 8 20:17:05 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 8 20:17:05 2017 +0100

----------------------------------------------------------------------
 .../asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[3/3] isis git commit: Merge branch 'ISIS-1712_pr-91'

Posted by da...@apache.org.
Merge branch 'ISIS-1712_pr-91'


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cb9c522f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cb9c522f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cb9c522f

Branch: refs/heads/master
Commit: cb9c522f85f216c0c64781ae26fb1d5d4cb885a6
Parents: 258a9e9 41c6081
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 8 20:17:08 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 8 20:17:08 2017 +0100

----------------------------------------------------------------------
 .../asciidoc/guides/rgcms/_rgcms_methods_reserved_disable.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------