Clone Tools
  • last updated 29 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge 'master' into 'v2'

    • -3
    • +1
    ./valuechoices/ValueChoicesSelect2Panel.java
  1. … 36 more files in changeset.
ISIS-2001: simplifies enum that describes whether repaint is necessary

    • -25
    • +10
    ./ScalarPanelSelect2Abstract.java
  1. … 1 more file in changeset.
ISIS-2001: always recalculates pending, even if changed visibility/usability

ISIS-2001: adds first cut on disabling params

  1. … 3 more files in changeset.
ISIS-2001: now only repaints entire param form if required.

Rather than return a boolean indicating we require repaint, we return a value of an enum that indicates what exactly changed.

  1. … 1 more file in changeset.
ISIS-2001: now hides actoin parameters dynamically

... somewhat against expectations. Don't knock it.

  1. … 8 more files in changeset.
ISIS-2001: removes duplication between ScalarPanelAbstract2 and ScalarModel

... pushes responsibility down to ScalarModel (which in turn now delegates to ObjectAdapterMemento)

  1. … 2 more files in changeset.
ISIS-2001: caters for dependent defaults returning collection, also makes logic for recomputing default more sophisticated...

... based on *which* previous parameter actually changed.

  1. … 11 more files in changeset.
ISIS-2001: generalizes the wicket viewer to support "dependent defaults"

Also, the Wicket viewer will automatically check that defaults are compatible with choices available for the argument (if any) and reset if required.

    • -3
    • +1
    ./valuechoices/ValueChoicesSelect2Panel.java
  1. … 7 more files in changeset.
ISIS-2033: cleaning up ServiceInjector interface

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -4
    • +2
    ./ScalarPanelTextFieldDatePickerAbstract.java
  1. … 31 more files in changeset.
ISIS-2102: add EventStreamService and SSESupport scripts

Task-Url: https://issues.apache.org/jira/browse/ISIS-2102

    • -1
    • +1
    ./markup/MarkupComponent_observing.java
  1. … 9 more files in changeset.
ISIS-2102: Support for Server Side Events (SSE)

extending the programming model with @Property(observe=...)

Task-Url: https://issues.apache.org/jira/browse/ISIS-2102

    • -0
    • +74
    ./markup/MarkupComponent_observing.java
    • -0
    • +23
    ./markup/ObservingComponent.js
  1. … 11 more files in changeset.
ISIS-2033: consolidating enums ManagedObjectType + MetaModelService.Sort

.. into org.apache.isis.applib.metamodel.ManagedObjectSort

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 14 more files in changeset.
ISIS-2033: automated 'organize imports' on 'runtime' and 'viewers'

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -8
    • +7
    ./ScalarPanelTextFieldDatePickerAbstract.java
    • -4
    • +3
    ./ScalarPanelTextFieldParseableAbstract.java
    • -7
    • +6
    ./datepicker/TextFieldWithDateTimePicker.java
    • -2
    • +1
    ./isisapplib/IsisBlobPanelFactory.java
  1. … 354 more files in changeset.
ISIS-2033: further remove uses of PersistenceSession

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -19
    • +14
    ./ScalarPanelTextFieldAbstract.java
    • -16
    • +12
    ./isisapplib/IsisBlobOrClobPanelAbstract.java
  1. … 23 more files in changeset.
Revert "ISIS-2033: introduces ManagedObjectState"

This reverts commit 525a92c0bfec2099ddce33d0526d62cf5b0474fd.

  1. … 24 more files in changeset.
ISIS-2033: introduces ManagedObjectState

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 24 more files in changeset.
ISIS-2033: cleanup, ObjectAdapterMemento's ConcurrencyChecking removed

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

  1. … 13 more files in changeset.
ISIS-2033: makes ObjectAdapterMemento an Interface

also implements CDIContextManager

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -1
    • +1
    ./valuechoices/ValueChoicesSelect2Panel.java
  1. … 24 more files in changeset.
fixes previous merge

  1. … 1 more file in changeset.
Merge branch 'master' into v2

  1. … 12 more files in changeset.
ISIS-2078: correctly honours promptStyle for menu items (service actions), and adds a new config property for the default dialogMode if set to DIALOG.

...so that entities can use sidebar by default, but services/menus can use modal dialog, say.

  1. … 9 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

# adocs/documentation/src/main/asciidoc/__versions.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_render.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc

# adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc

# adocs/documentation/src/main/asciidoc/pages/tg/tg.adoc

# adocs/template/document.html.erb

# core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java

# core/applib/src/main/java/org/apache/isis/applib/annotation/DomainObjectLayout.java

# core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java

# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java

  1. … 47 more files in changeset.
ISIS-2033: minor: renaming method

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -1
    • +1
    ./ScalarPanelTextFieldDatePickerAbstract.java
  1. … 46 more files in changeset.
ISIS-2077: extends @ActionLayout to allow modal vs sidebar promptStyle to be selected on an action-by-action basis

(Rather than only globally selected via a configuration property)

  1. … 8 more files in changeset.
ISIS-2078: extends @ActionLayout to allow modal vs sidebar promptStyle to be selected on an action-by-action basis

(Rather than only globally selected via a configuration property)

  1. … 8 more files in changeset.
Merge branch 'v2' into 2033-IoC

Conflicts:

core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java

core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java

core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java

core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_value.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java

core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java

core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTest_object.java

core/pom.xml

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

  1. … 38 more files in changeset.
Merge branch 'master' into v2

# Conflicts:

# core/config/src/main/java/org/apache/isis/config/builder/IsisConfigurationDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutor.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java

# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java

# core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java

# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java

# core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ObjectTypeAnnotationFacetFactoryTest.java

# core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents4.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java

# core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.html

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java

# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java

# example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

  1. … 59 more files in changeset.
ISIS-2053: removes tabindex=-1 for a href's, specify focus styling for all themes.

Also:

- disallow tabbing into the underlying widget (textarea etc) contained within the "inline" editing hyperlink <a>

  1. … 23 more files in changeset.
ISIS-2033: remove AppManifestProvider interface and do some cleanup

Task-Url: https://issues.apache.org/jira/browse/ISIS-2033

    • -2
    • +3
    ./datepicker/TextFieldWithDateTimePicker.java
  1. … 24 more files in changeset.