-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CompositeControl: better handling of ambiguous GetContents, test for …
…inheritance According to #1613 CompositeControl do not work with both base and derived types defining GetContents method. I could not replicate that, the provided example works for me, maybe it was fixed accidentaly. * I added test for that * In any case, multiple GetContents overloads were handled poorly, I added better error for this case. In the issue, I mentioned that it would be complex to handle potential redefinition or "removal" of properties in the derived type. That isn't really the case, both cases don't need any special code * The "removal" - omission of an property in the derived type is simply ignored. I think that it's quite intuitive that properties can't disapear in derived types, if the GetContents doesn't ask for it it won't get it. * Redefinition is already handled reasonably, since we can already try to redefine IncludeInPage or some capability property. Resolves #1613
- Loading branch information
Showing
3 changed files
with
63 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
src/Tests/ControlTests/testoutputs/CompositeControlTests.CompositeControlInheritance.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<html> | ||
<head></head> | ||
<body> | ||
<div>Text1</div> | ||
<p>SecondText1.1</p> | ||
</body> | ||
</html> |