You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/09/27 14:04:41 UTC
[myfaces-tobago] branch master updated (ee39ba6 -> dc86601)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from ee39ba6 Nicer menu in demo
new fa50ae4 fix UnitTest
new dc86601 TOBAGO-1723: tc:segmentLayout can't be direct child of tc:segmentLayout TOBAGO-1678: Override default layout for SegementLayout * change attribute names: drop "overwrite" prefix
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tobago/facelets/SegmentLayoutConstraintHandler.java | 10 +++++-----
.../component/SegmentLayoutConstraintTagDeclaration.java | 10 +++++-----
.../30-concept/16-layout/30-segment/segment-layout.xhtml | 2 +-
.../apache/myfaces/tobago/example/demo/NavigationUnitTest.java | 1 +
4 files changed, 12 insertions(+), 11 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-tobago] 02/02: TOBAGO-1723: tc:segmentLayout can't be
direct child of tc:segmentLayout TOBAGO-1678: Override default layout for
SegementLayout * change attribute names: drop "overwrite" prefix
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit dc8660161f4564cd7a09500925c979eeb7380070
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Sep 27 15:58:06 2017 +0200
TOBAGO-1723: tc:segmentLayout can't be direct child of tc:segmentLayout
TOBAGO-1678: Override default layout for SegementLayout
* change attribute names: drop "overwrite" prefix
---
.../tobago/facelets/SegmentLayoutConstraintHandler.java | 10 +++++-----
.../component/SegmentLayoutConstraintTagDeclaration.java | 10 +++++-----
.../30-concept/16-layout/30-segment/segment-layout.xhtml | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
index 5154e01..af677e1 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/SegmentLayoutConstraintHandler.java
@@ -47,11 +47,11 @@ public class SegmentLayoutConstraintHandler extends TagHandler {
offsetSmall = getAttribute(Attributes.offsetSmall.getName());
offsetMedium = getAttribute(Attributes.offsetMedium.getName());
offsetLarge = getAttribute(Attributes.offsetLarge.getName());
- overwriteExtraSmall = getAttribute(Attributes.overwriteExtraSmall.getName());
- overwriteSmall = getAttribute(Attributes.overwriteSmall.getName());
- overwriteMedium = getAttribute(Attributes.overwriteMedium.getName());
- overwriteLarge = getAttribute(Attributes.overwriteLarge.getName());
- overwriteExtraLarge = getAttribute(Attributes.overwriteExtraLarge.getName());
+ overwriteExtraSmall = getAttribute(Attributes.extraSmall.getName());
+ overwriteSmall = getAttribute(Attributes.small.getName());
+ overwriteMedium = getAttribute(Attributes.medium.getName());
+ overwriteLarge = getAttribute(Attributes.large.getName());
+ overwriteExtraLarge = getAttribute(Attributes.extraLarge.getName());
}
@Override
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
index 80ccb85..89365de 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
@@ -68,29 +68,29 @@ public interface SegmentLayoutConstraintTagDeclaration {
* Overwrite the default layout for extra small devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOverwriteExtraSmall(final ValueExpression overwriteExtraSmall);
+ void setExtraSmall(final ValueExpression extraSmall);
/**
* Overwrite the default layout for small devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOverwriteSmall(final ValueExpression overwriteSmall);
+ void setSmall(final ValueExpression small);
/**
* Overwrite the default layout for medium devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOverwriteMedium(final ValueExpression overwriteMedium);
+ void setMedium(final ValueExpression medium);
/**
* Overwrite the default layout for large devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOverwriteLarge(final ValueExpression overwriteLarge);
+ void setLarge(final ValueExpression large);
/**
* Overwrite the default layout for extra large devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOverwriteExtraLarge(final ValueExpression overwriteExtraLarge);
+ void setExtraLarge(final ValueExpression extraLarge);
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml
index 9bded06..dbdf18b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/30-segment/segment-layout.xhtml
@@ -140,7 +140,7 @@
<tc:in/>
<tc:in/>
<tc:in>
- <tc:segmentLayoutConstraint overwriteMedium="3"/>
+ <tc:segmentLayoutConstraint medium="3"/>
</tc:in>
<tc:in/>
</tc:segmentLayout>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 01/02: fix UnitTest
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit fa50ae46f29fde3db46a5019cfd59bd624f1c0a5
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Sep 27 15:45:40 2017 +0200
fix UnitTest
---
.../java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java
index c5db41c..0206b7d 100644
--- a/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java
+++ b/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/NavigationUnitTest.java
@@ -31,6 +31,7 @@ import java.util.List;
public class NavigationUnitTest extends AbstractTobagoTestBase {
private static final List<String> LIST = new ArrayList<>(Arrays.asList(
+ "/content/root-dummy.xhtml",
"/content/00/test-1.xhtml",
"/content/00/07/test-2.xhtml",
"/content/01/test.xhtml",
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.