Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'maint-1.16.2'

  1. … 5 more files in changeset.
ISIS-1813: fixes java7/8 compilation issue (unused import from Java 8)

ISIS-1743: fixes backport issue

ISIS-1743: also supports mixins specified using @Mixin(method="...") eg "act" or "coll" as well as the default "$$"

    • -1
    • +1
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -30
    • +20
    ./annotprop/MixinInterceptor.java
  1. … 3 more files in changeset.
ISIS-1743: also supports mixins specified using @Mixin(method="...") eg "act" or "coll" as well as the default "$$"

    • -1
    • +1
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -30
    • +20
    ./annotprop/MixinInterceptor.java
  1. … 3 more files in changeset.
ISIS-1743 fa-Icon mapping for mixins using '$$' method names

    • -7
    • +2
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -0
    • +75
    ./annotprop/MixinInterceptor.java
ISIS-1743 fa-Icon mapping for mixins using '$$' method names

    • -7
    • +2
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -0
    • +75
    ./annotprop/MixinInterceptor.java
ISIS-1742: removes support for .layout.json files

    • -18
    • +1
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 150 more files in changeset.
ISIS-1742: removes @CssClassFa annotation and updates facet.

Also updates .adocs for @CssClass and @CssClassFa

    • -24
    • +1
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 4 more files in changeset.
ISIS-1407: removed SpecificationLoaderAware.

Also:

- minor extension to ServiceRegistry2

- collapsed ServicesInjector, ServicesInjectorSpi and ServicesInjectorDefault to just ServicesInjector.

    • -1
    • +1
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 271 more files in changeset.
ISIS-1406: lots more refactoring around IsisConfiguration and IsisConfigurationBuilder.

specifically:

- simplified IsisConfigurationBuilder, now a single class (rather than an interface with 4 different impls, only 2 of which were used).

- removed IsisRunner, so that the command line options are now a responsibility of the IsisConfigurationBuilder

- IsisConfigurationBuilder is passed from o.a.i.WebServer to IsisWicketApplication (not just the "primers"

- removed OptionValidator, wasn't being used

- FacetFactoryAbstract responsible for providing IsisConfiguration to all subclass impls

- InstallerLookup simplified, no longer responsible for appending to the IsisConfigurationBuilder

- InstallerAbstract impls now all have the IsisConfiguration injected into them (constructor injection).

- removed duplication between IsisWebAppBootstrapper and IsisWicketApplication

As of this commit the app runs, but the fixtures are not being automatically installed.

    • -6
    • +2
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 105 more files in changeset.
ISIS-1405: removing IsisConfigurationAware.

    • -9
    • +13
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 90 more files in changeset.
ISIS-993: fleshing out the GridNormalizerServiceAbstract for the "complete" and "minimal" updating of Grid graphs (prior to conversion to XML).

  1. … 15 more files in changeset.
ISIS-1085: reviewing; reverting the deletion of ActionLayout.CssClassFaPosition and the introduction of CssClassFaPosition ...

... as this would break backward compatibility. Instead introduced similar enums into DomainObjectLayout and ViewModelLayout. The CssClassFaPosition enum itself moves from applib to core.metamodel.

    • -0
    • +75
    ./CssClassFaPosition.java
    • -13
    • +13
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -1
    • +1
    ./annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
    • -1
    • +1
    ./annotprop/CssClassFaFacetOnMemberFromProperties.java
  1. … 23 more files in changeset.
ISIS-1085: martin's review suggestions included

    • -26
    • +12
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 5 more files in changeset.
ISIS-1085: more references to ActionLayout.CssClassFaPosition replaced by CssClassFaPosition in applib, metamodel, and viewer-wicket.

  1. … 11 more files in changeset.
ISIS-1085: more references to ActionLayout.CssClassFaPosition replaced by CssClassFaPosition in applib, metamodel, and viewer-wicket.

  1. … 11 more files in changeset.
ISIS-1085: enum CssClassFaPosition extracted, references to ActionLayout.CssClassFaPosition replaced, tests in DomainObjectLayoutFactoryTest amended, outdated(?) CssClassFaAnnotationOnMemberFacetFactoryTest removed.

    • -5
    • +5
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -2
    • +2
    ./annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
    • -21
    • +20
    ./annotprop/CssClassFaFacetOnMemberFromProperties.java
  1. … 17 more files in changeset.
ISIS-1085: enum CssClassFaPosition extracted, references to ActionLayout.CssClassFaPosition replaced, tests in DomainObjectLayoutFactoryTest amended, outdated(?) CssClassFaAnnotationOnMemberFacetFactoryTest removed.

    • -5
    • +5
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -2
    • +2
    ./annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
    • -21
    • +20
    ./annotprop/CssClassFaFacetOnMemberFromProperties.java
  1. … 17 more files in changeset.
ISIS-1085 Add cssClassFa to DomainObjectLayout

    • -35
    • +0
    ./annotprop/CssClassFaFacetOnMemberAnnotation.java
    • -50
    • +56
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 13 more files in changeset.
ISIS-903: can now write to .pot and read from .po file

  1. … 19 more files in changeset.
ISIS-903: fixing bug introduced on minor improvement to CssClassFa facet

  1. … 1 more file in changeset.
ISIS-903: TranslationService, LocaleProvider, TrString class,

also:

- deprecated a bunch of old *Event files in the applib, for wrapper factory only.

  1. … 38 more files in changeset.
ISIS-1027: improving validation messages

- show if the method is inherited or not

- reformat messages to put the violation class/method first

- order the messages alphabetically

Also:

- changed Optionality enum in applib, from TRUE|FALSE to OPTIONAL|MANDATORY.

- updates to the DomainChangeJdoAbstract

    • -1
    • +1
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 89 more files in changeset.
ISIS-1027: marking facet classes as deprecated; some minor incidental tidy-up

    • -0
    • +4
    ./annotprop/CssClassFaFacetOnMemberAnnotation.java
  1. … 263 more files in changeset.
ISIS-1027: more stuff...

... undeprecating Isis' own services (eg EventBusServiceJdo)

... adding in validators for XxxAnnotationFacetFactory

... moving Bounded and ObjectType annotation processing into DomainObjectAnnotationFacetFactory

    • -1
    • +1
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 65 more files in changeset.
ISIS-1027: first cut impl, still to test

    • -2
    • +15
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 89 more files in changeset.
ISIS-970: consolidating processing into DomainObjectAnnotationFacetFactory, ActionAnnotationFF, PropertyAnnotationFF, CollectionAnnotationFF

Also:

- renamed XxxInteractionFacet to XxxDomainEventFacet throughout.

  1. … 220 more files in changeset.
ISIS-972 Make it possible to set FontAwesome icons after the label for action links

    • -2
    • +3
    ./annotprop/CssClassFaFacetOnMemberAnnotation.java
    • -5
    • +21
    ./annotprop/CssClassFaFacetOnMemberFactory.java
    • -2
    • +3
    ./annotprop/CssClassFaFacetOnMemberFromConfiguredRegex.java
    • -1
    • +7
    ./annotprop/CssClassFaFacetOnMemberFromProperties.java
  1. … 31 more files in changeset.
ISIS-537: pattern matching of CSS classes based on action name (similar to FA icons)

Also: required to inject ServicesInjector into facet factory to query whether a method was from a service or not. To support this, refactored so that ServicesInjectorDefault is basically has global scope as opposed to session/request scope. Implementation adapted from that already used for SpecificationLoader (aka the ObjectReflector). A bit hacky, but a move in the right general direction.

    • -3
    • +3
    ./annotprop/CssClassFaFacetOnMemberFactory.java
  1. … 15 more files in changeset.