You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/11/10 09:02:56 UTC
svn commit: r1033387 [3/5] - in /myfaces/trinidad/trunk:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/
trinidad-api/src/main/java/org/apache/myfaces/trinidad/event/ tri...
Modified: myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/ClientIdCachingTest.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/ClientIdCachingTest.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/ClientIdCachingTest.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/ClientIdCachingTest.java Wed Nov 10 08:02:53 2010
@@ -1,143 +1,143 @@
-/*
- * 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.
- */
-package org.apache.myfaces.trinidad.component;
-
-import javax.faces.component.NamingContainer;
-import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.myfaces.trinidadbuild.test.FacesTestCase;
-
-import org.apache.myfaces.trinidad.component.UIXPanel;
-
-public class ClientIdCachingTest extends FacesTestCase
-{
- public static final Test suite()
- {
- return new TestSuite(ClientIdCachingTest.class);
- }
-
- public static void main(String[] args) throws Throwable
- {
- junit.textui.TestRunner.run(suite());
- }
-
- public ClientIdCachingTest(
- String testName)
- {
- super(testName);
- }
-
- static private class TestPanel extends UIXPanel
- {
- protected Renderer getRenderer(FacesContext context)
- {
- return null;
- }
- }
-
- static private class TestNamingContainer extends TestPanel
- implements NamingContainer
- {
- }
-
- // Test nested NamingContainer callbacks
- @SuppressWarnings("unchecked")
- public void testBasic()
- {
- TestNamingContainer a = new TestNamingContainer(); a.setId("a");
- TestNamingContainer b = new TestNamingContainer(); b.setId("b");
- TestNamingContainer d = new TestNamingContainer(); d.setId("d");
- TestPanel e = new TestPanel(); e.setId("e");
- TestPanel g = new TestPanel(); g.setId("g");
- a.getChildren().add(b);
- b.getChildren().add(d);
- b.getChildren().add(g);
- d.getChildren().add(e);
-
- FacesContext context = FacesContext.getCurrentInstance();
- assertEquals("a:b:d:e", e.getClientId(context));
- }
-
- public void testSetId()
- {
- TestNamingContainer a = new TestNamingContainer(); a.setId("a");
- TestNamingContainer b = new TestNamingContainer(); b.setId("b");
- TestNamingContainer d = new TestNamingContainer(); d.setId("d");
- TestPanel e = new TestPanel(); e.setId("e");
- TestPanel g = new TestPanel(); g.setId("g");
- a.getChildren().add(b);
- b.getChildren().add(d);
- b.getChildren().add(g);
- d.getChildren().add(e);
-
- // prime
- FacesContext context = FacesContext.getCurrentInstance();
- assertEquals("a:b:d:e", e.getClientId(context));
-
- // set the component's id using accessor
- e.setId("ePrime");
- assertEquals("a:b:d:ePrime", e.getClientId(context));
-
- // set the component's id using attribute map
- e.getAttributes().put("id", "eDoublePrime");
- assertEquals("a:b:d:eDoublePrime", e.getClientId(context));
-
-
- // set an ancsestor's id using accessor
- b.setId("bPrime");
- assertEquals("a:bPrime:d:eDoublePrime", e.getClientId(context));
-
- // set the component's id using attribute map
- b.getAttributes().put("id", "bDoublePrime");
- assertEquals("a:bDoublePrime:d:eDoublePrime", e.getClientId(context));
- }
-
- public void testMoving()
- {
- TestNamingContainer a = new TestNamingContainer(); a.setId("a");
- TestNamingContainer b = new TestNamingContainer(); b.setId("b");
- TestNamingContainer c = new TestNamingContainer(); c.setId("c");
- TestNamingContainer d = new TestNamingContainer(); d.setId("d");
- TestPanel e = new TestPanel(); e.setId("e");
- TestPanel f = new TestPanel(); f.setId("f");
- TestPanel g = new TestPanel(); g.setId("g");
- a.getChildren().add(b);
- a.getChildren().add(c);
- b.getChildren().add(d);
- b.getChildren().add(g);
- d.getChildren().add(e);
- d.getChildren().add(f);
-
- // prime
- FacesContext context = FacesContext.getCurrentInstance();
- assertEquals("a:b:d:e", e.getClientId(context));
-
- // move within same NamingContainer--no clientId change
- f.getChildren().add(e);
- assertEquals("a:b:d:e", e.getClientId(context));
-
- // move between NamingContainers
- g.getChildren().add(e);
- assertEquals("a:b:e", e.getClientId(context));
- }
-}
+/*
+ * 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.
+ */
+package org.apache.myfaces.trinidad.component;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.context.FacesContext;
+import javax.faces.render.Renderer;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.myfaces.trinidadbuild.test.FacesTestCase;
+
+import org.apache.myfaces.trinidad.component.UIXPanel;
+
+public class ClientIdCachingTest extends FacesTestCase
+{
+ public static final Test suite()
+ {
+ return new TestSuite(ClientIdCachingTest.class);
+ }
+
+ public static void main(String[] args) throws Throwable
+ {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ public ClientIdCachingTest(
+ String testName)
+ {
+ super(testName);
+ }
+
+ static private class TestPanel extends UIXPanel
+ {
+ protected Renderer getRenderer(FacesContext context)
+ {
+ return null;
+ }
+ }
+
+ static private class TestNamingContainer extends TestPanel
+ implements NamingContainer
+ {
+ }
+
+ // Test nested NamingContainer callbacks
+ @SuppressWarnings("unchecked")
+ public void testBasic()
+ {
+ TestNamingContainer a = new TestNamingContainer(); a.setId("a");
+ TestNamingContainer b = new TestNamingContainer(); b.setId("b");
+ TestNamingContainer d = new TestNamingContainer(); d.setId("d");
+ TestPanel e = new TestPanel(); e.setId("e");
+ TestPanel g = new TestPanel(); g.setId("g");
+ a.getChildren().add(b);
+ b.getChildren().add(d);
+ b.getChildren().add(g);
+ d.getChildren().add(e);
+
+ FacesContext context = FacesContext.getCurrentInstance();
+ assertEquals("a:b:d:e", e.getClientId(context));
+ }
+
+ public void testSetId()
+ {
+ TestNamingContainer a = new TestNamingContainer(); a.setId("a");
+ TestNamingContainer b = new TestNamingContainer(); b.setId("b");
+ TestNamingContainer d = new TestNamingContainer(); d.setId("d");
+ TestPanel e = new TestPanel(); e.setId("e");
+ TestPanel g = new TestPanel(); g.setId("g");
+ a.getChildren().add(b);
+ b.getChildren().add(d);
+ b.getChildren().add(g);
+ d.getChildren().add(e);
+
+ // prime
+ FacesContext context = FacesContext.getCurrentInstance();
+ assertEquals("a:b:d:e", e.getClientId(context));
+
+ // set the component's id using accessor
+ e.setId("ePrime");
+ assertEquals("a:b:d:ePrime", e.getClientId(context));
+
+ // set the component's id using attribute map
+ e.getAttributes().put("id", "eDoublePrime");
+ assertEquals("a:b:d:eDoublePrime", e.getClientId(context));
+
+
+ // set an ancsestor's id using accessor
+ b.setId("bPrime");
+ assertEquals("a:bPrime:d:eDoublePrime", e.getClientId(context));
+
+ // set the component's id using attribute map
+ b.getAttributes().put("id", "bDoublePrime");
+ assertEquals("a:bDoublePrime:d:eDoublePrime", e.getClientId(context));
+ }
+
+ public void testMoving()
+ {
+ TestNamingContainer a = new TestNamingContainer(); a.setId("a");
+ TestNamingContainer b = new TestNamingContainer(); b.setId("b");
+ TestNamingContainer c = new TestNamingContainer(); c.setId("c");
+ TestNamingContainer d = new TestNamingContainer(); d.setId("d");
+ TestPanel e = new TestPanel(); e.setId("e");
+ TestPanel f = new TestPanel(); f.setId("f");
+ TestPanel g = new TestPanel(); g.setId("g");
+ a.getChildren().add(b);
+ a.getChildren().add(c);
+ b.getChildren().add(d);
+ b.getChildren().add(g);
+ d.getChildren().add(e);
+ d.getChildren().add(f);
+
+ // prime
+ FacesContext context = FacesContext.getCurrentInstance();
+ assertEquals("a:b:d:e", e.getClientId(context));
+
+ // move within same NamingContainer--no clientId change
+ f.getChildren().add(e);
+ assertEquals("a:b:d:e", e.getClientId(context));
+
+ // move between NamingContainers
+ g.getChildren().add(e);
+ assertEquals("a:b:e", e.getClientId(context));
+ }
+}
Propchange: myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/ClientIdCachingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-api/src/test/java/org/apache/myfaces/trinidad/util/ComponentReferenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/FeatureDemoInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/FeatureDemoRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/changePersistence/addRemoveFacets/AddRemoveFacetsDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/changePersistence/addRemoveReorderChildren/AddRemoveReorderChildrenDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/changePersistence/explicitAttributeChange/ExplicitAttributeChangeDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/changePersistence/implicitAttributeChange/ImplicitAttributeChangeDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/convertersAndValidators/clientSideConverters/ClientSideConvertersDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/convertersAndValidators/clientSideDateRestriction/ClientSideDateRestrictionDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/convertersAndValidators/clientSideValidators/ClientSideValidatorsDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/convertersAndValidators/messageCustomization/MessageCustomizationDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/convertersAndValidators/serverSideConverters/ServerSideConvertersDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/convertersAndValidators/serverSideDateRestrictions/ServerSideDateRestrictionsDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/convertersAndValidators/serverSideValidators/ServerSideValidatorsDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/others/accessibilityProfile/AccessibilityProfileDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/others/dialogFramework/DialogFrameworkDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/others/fileDownload/FileDownloadDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/others/partialPageRendering/PartialPageRenderingDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/others/progressSteps/ProgressStepsDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/others/showDetailDisclosure/ShowDetailDisclosureDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/table/addRow/AddRowDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/table/exportToCSV/ExportToCSVDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/feature/table/totalRow/TotalRowDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/samples/email/ContactListBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/samples/email/Email.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/samples/email/ReceivedEmailListBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/samples/email/SentEmailListBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/samples/email/TableBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/FeatureDemoCategoryId.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/FeatureDemoId.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IFeatureDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/IFeatureDemoCategory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/AbstractFeatureDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/impl/FeatureDemoCategoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/src/main/java/org/apache/myfaces/trinidaddemo/support/util/SkinFamilySelection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProfanityScanner.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SkinDirtyPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SkinDirtyPhaseListener.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SkinDirtyPhaseListener.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SkinDirtyPhaseListener.java Wed Nov 10 08:02:53 2010
@@ -1,70 +1,70 @@
-package org.apache.myfaces.trinidaddemo;
-
-import javax.faces.event.ActionEvent;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-
-import javax.servlet.ServletContext;
-
-import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidad.context.RequestContext;
-
-/**
- * This class is used in panelPageSkinDemo.jspx. It sets the Skin to dirty so that if you
- * change a skin css file it gets picked up immediately without the need to set the web.xml
- * CHECK_FILE_MODIFICATION flag.
- */
-public class SkinDirtyPhaseListener
- implements PhaseListener
-{
- public SkinDirtyPhaseListener()
- {
- super();
- }
-
- public void afterPhase(PhaseEvent phaseEvent)
- {
-
- }
-
- public void beforePhase(PhaseEvent phaseEvent)
- {
- // Add event code here...
- System.out.println("***PhaseTracker: After Phase: " + phaseEvent.getPhaseId());
- RenderingContext rContext = RenderingContext.getCurrentInstance();
-
- if (rContext != null)
- {
- System.out.println("Set Skin to dirty if button was pressed, and it is set to :" + _pressedButton);
- if (_pressedButton)
- {
- System.out.println("Setting the skin to be dirty will allow you to refresh your browser and see any changes to the skin's css file immediately.");
- rContext.getSkin().setDirty(true);
- _pressedButton = false;
- }
- else
- {
- System.out.println("Set Skin to not be dirty");
- rContext.getSkin().setDirty(false);
- }
- }
- else
- System.out.println("rContext in _afterPhase is null!");
-
- }
-
- public PhaseId getPhaseId()
- {
- return PhaseId.RESTORE_VIEW;
- }
-
- public void buttonAction(ActionEvent action) {
- System.out.println("You pressed the button");
- _pressedButton = true;
-
- }
-
-
- private boolean _pressedButton = false;
-}
+package org.apache.myfaces.trinidaddemo;
+
+import javax.faces.event.ActionEvent;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+import javax.servlet.ServletContext;
+
+import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.context.RequestContext;
+
+/**
+ * This class is used in panelPageSkinDemo.jspx. It sets the Skin to dirty so that if you
+ * change a skin css file it gets picked up immediately without the need to set the web.xml
+ * CHECK_FILE_MODIFICATION flag.
+ */
+public class SkinDirtyPhaseListener
+ implements PhaseListener
+{
+ public SkinDirtyPhaseListener()
+ {
+ super();
+ }
+
+ public void afterPhase(PhaseEvent phaseEvent)
+ {
+
+ }
+
+ public void beforePhase(PhaseEvent phaseEvent)
+ {
+ // Add event code here...
+ System.out.println("***PhaseTracker: After Phase: " + phaseEvent.getPhaseId());
+ RenderingContext rContext = RenderingContext.getCurrentInstance();
+
+ if (rContext != null)
+ {
+ System.out.println("Set Skin to dirty if button was pressed, and it is set to :" + _pressedButton);
+ if (_pressedButton)
+ {
+ System.out.println("Setting the skin to be dirty will allow you to refresh your browser and see any changes to the skin's css file immediately.");
+ rContext.getSkin().setDirty(true);
+ _pressedButton = false;
+ }
+ else
+ {
+ System.out.println("Set Skin to not be dirty");
+ rContext.getSkin().setDirty(false);
+ }
+ }
+ else
+ System.out.println("rContext in _afterPhase is null!");
+
+ }
+
+ public PhaseId getPhaseId()
+ {
+ return PhaseId.RESTORE_VIEW;
+ }
+
+ public void buttonAction(ActionEvent action) {
+ System.out.println("You pressed the button");
+ _pressedButton = true;
+
+ }
+
+
+ private boolean _pressedButton = false;
+}
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SkinDirtyPhaseListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SubformBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SubformBean.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SubformBean.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SubformBean.java Wed Nov 10 08:02:53 2010
@@ -1,124 +1,124 @@
-/*
- * 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.
- */
-package org.apache.myfaces.trinidaddemo;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.faces.event.ActionEvent;
-
-
-public class SubformBean
-{
-
- public SubformBean()
- {
-
- }
-
- public List<MyItem> getTexts2()
- {
- return sItems2;
- }
-
- public List<MyItem> getTexts()
- {
- return sItems;
- }
-
-
- public void setSubformValue1(String _subformValue1)
- {
- this._subformValue1 = _subformValue1;
- }
-
- public String getSubformValue1()
- {
- return _subformValue1;
- }
-
- public void setSubformValue2(String _subformValue2)
- {
- this._subformValue2 = _subformValue2;
- }
-
- public String getSubformValue2()
- {
- return _subformValue2;
- }
-
- public void setSubformValue3(String _subformValue3)
- {
- this._subformValue3 = _subformValue3;
- }
-
- public String getSubformValue3()
- {
- return _subformValue3;
- }
-
- public void setSubformValue4(String _subformValue4)
- {
- this._subformValue4 = _subformValue4;
- }
-
- public String getSubformValue4()
- {
- return _subformValue4;
- }
-
-
- private String _subformValue1;
- private String _subformValue2;
- private String _subformValue3;
- private String _subformValue4;
-
- private static final List<MyItem> sItems =
- Arrays.asList(new MyItem(null), new MyItem(null), new MyItem(null));
-
- private static final List<MyItem> sItems2 =
- Arrays.asList(new MyItem(null), new MyItem(null), new MyItem(null));
-
-
- public static class MyItem
- {
- public MyItem(String text)
- {
- mText = text;
- }
-
- public String getText()
- {
- return mText;
- }
-
- public void setText(String text)
- {
- System.out.println("setter called with " + text);
- mText = text;
- }
-
- public void doSomething(ActionEvent event)
- {
- System.out.println("in doSomething(), value is" + mText);
- }
-
- private String mText;
- }
-}
+/*
+ * 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.
+ */
+package org.apache.myfaces.trinidaddemo;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.faces.event.ActionEvent;
+
+
+public class SubformBean
+{
+
+ public SubformBean()
+ {
+
+ }
+
+ public List<MyItem> getTexts2()
+ {
+ return sItems2;
+ }
+
+ public List<MyItem> getTexts()
+ {
+ return sItems;
+ }
+
+
+ public void setSubformValue1(String _subformValue1)
+ {
+ this._subformValue1 = _subformValue1;
+ }
+
+ public String getSubformValue1()
+ {
+ return _subformValue1;
+ }
+
+ public void setSubformValue2(String _subformValue2)
+ {
+ this._subformValue2 = _subformValue2;
+ }
+
+ public String getSubformValue2()
+ {
+ return _subformValue2;
+ }
+
+ public void setSubformValue3(String _subformValue3)
+ {
+ this._subformValue3 = _subformValue3;
+ }
+
+ public String getSubformValue3()
+ {
+ return _subformValue3;
+ }
+
+ public void setSubformValue4(String _subformValue4)
+ {
+ this._subformValue4 = _subformValue4;
+ }
+
+ public String getSubformValue4()
+ {
+ return _subformValue4;
+ }
+
+
+ private String _subformValue1;
+ private String _subformValue2;
+ private String _subformValue3;
+ private String _subformValue4;
+
+ private static final List<MyItem> sItems =
+ Arrays.asList(new MyItem(null), new MyItem(null), new MyItem(null));
+
+ private static final List<MyItem> sItems2 =
+ Arrays.asList(new MyItem(null), new MyItem(null), new MyItem(null));
+
+
+ public static class MyItem
+ {
+ public MyItem(String text)
+ {
+ mText = text;
+ }
+
+ public String getText()
+ {
+ return mText;
+ }
+
+ public void setText(String text)
+ {
+ System.out.println("setter called with " + text);
+ mText = text;
+ }
+
+ public void doSomething(ActionEvent event)
+ {
+ System.out.println("in doSomething(), value is" + mText);
+ }
+
+ private String mText;
+ }
+}
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SubformBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/TestStateSavingBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/TestStateSavingBean.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/TestStateSavingBean.java (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/TestStateSavingBean.java Wed Nov 10 08:02:53 2010
@@ -1,87 +1,87 @@
-/*
- * 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.
- */
-
-package org.apache.myfaces.trinidaddemo.test.stateSaving;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-
-import org.apache.myfaces.trinidad.component.core.input.CoreChooseDate;
-import org.apache.myfaces.trinidad.component.core.layout.CoreShowDetail;
-import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
-
-
-public class TestStateSavingBean
-{
-
- public void incrementMutable(ActionEvent ae)
- {
- FacesContext context = FacesContext.getCurrentInstance();
- CoreChooseDate cd = (CoreChooseDate)context.getViewRoot().findComponent("cdMutable");
- Date maxDate = cd.getMaxValue();
-
- Calendar cal = Calendar.getInstance();
- cal.setTime(maxDate);
- cal.add(Calendar.DAY_OF_YEAR, 1);
- maxDate.setTime(cal.getTimeInMillis());
- }
-
- public void incrementWithSet(ActionEvent ae)
- {
- FacesContext context = FacesContext.getCurrentInstance();
- CoreChooseDate cd = (CoreChooseDate)context.getViewRoot().findComponent("cdSet");
- Date maxDate = cd.getMaxValue();
-
- Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(maxDate.getTime());
- cal.add(Calendar.DAY_OF_YEAR, 1);
- cd.setMaxValue(new Date(cal.getTimeInMillis()));
- }
-
- public void addComponent(ActionEvent ae)
- {
- System.out.println("Adding a showDetail child");
- CoreShowDetail showDetail = new CoreShowDetail();
- CoreOutputText outputText = new CoreOutputText();
- outputText.setValue("showDetail Content");
- showDetail.getChildren().add(outputText);
- FacesContext context = FacesContext.getCurrentInstance();
- context.getViewRoot().findComponent("groupLayout").getChildren().add(showDetail);
- }
-
- public void temporaryMoveComponent(ActionEvent ae)
- {
- System.out.println("Temporarily moving a component");
- UIComponent button = ae.getComponent();
- UIComponent moveme = button.findComponent("moveme");
- UIComponent moveto = button.findComponent("moveto");
- UIComponent parent = moveme.getParent();
-
- parent.getChildren().remove(moveme);
- moveto.getChildren().add(moveme);
- moveto.getChildren().remove(moveme);
- parent.getChildren().add(moveme);
- }
-
-
-}
+/*
+ * 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.
+ */
+
+package org.apache.myfaces.trinidaddemo.test.stateSaving;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.apache.myfaces.trinidad.component.core.input.CoreChooseDate;
+import org.apache.myfaces.trinidad.component.core.layout.CoreShowDetail;
+import org.apache.myfaces.trinidad.component.core.output.CoreOutputText;
+
+
+public class TestStateSavingBean
+{
+
+ public void incrementMutable(ActionEvent ae)
+ {
+ FacesContext context = FacesContext.getCurrentInstance();
+ CoreChooseDate cd = (CoreChooseDate)context.getViewRoot().findComponent("cdMutable");
+ Date maxDate = cd.getMaxValue();
+
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(maxDate);
+ cal.add(Calendar.DAY_OF_YEAR, 1);
+ maxDate.setTime(cal.getTimeInMillis());
+ }
+
+ public void incrementWithSet(ActionEvent ae)
+ {
+ FacesContext context = FacesContext.getCurrentInstance();
+ CoreChooseDate cd = (CoreChooseDate)context.getViewRoot().findComponent("cdSet");
+ Date maxDate = cd.getMaxValue();
+
+ Calendar cal = Calendar.getInstance();
+ cal.setTimeInMillis(maxDate.getTime());
+ cal.add(Calendar.DAY_OF_YEAR, 1);
+ cd.setMaxValue(new Date(cal.getTimeInMillis()));
+ }
+
+ public void addComponent(ActionEvent ae)
+ {
+ System.out.println("Adding a showDetail child");
+ CoreShowDetail showDetail = new CoreShowDetail();
+ CoreOutputText outputText = new CoreOutputText();
+ outputText.setValue("showDetail Content");
+ showDetail.getChildren().add(outputText);
+ FacesContext context = FacesContext.getCurrentInstance();
+ context.getViewRoot().findComponent("groupLayout").getChildren().add(showDetail);
+ }
+
+ public void temporaryMoveComponent(ActionEvent ae)
+ {
+ System.out.println("Temporarily moving a component");
+ UIComponent button = ae.getComponent();
+ UIComponent moveme = button.findComponent("moveme");
+ UIComponent moveto = button.findComponent("moveto");
+ UIComponent parent = moveme.getParent();
+
+ parent.getChildren().remove(moveme);
+ moveto.getChildren().add(moveme);
+ moveto.getChildren().remove(moveme);
+ parent.getChildren().add(moveme);
+ }
+
+
+}
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/test/stateSaving/TestStateSavingBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/util/BindingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/InternalViewHandlingStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewDeclarationLanguageFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/ContentTypeAndCharacterSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/dispatch/DispatchResourceResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/CompositeUploadedFileProcessorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadActionInvocationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadRequestManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadResourceRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/xmlHttp/XmlHttpPortletExternalContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/xmlHttp/XmlHttpResourceResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LegacyMethodBinding.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LegacyMethodBinding.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LegacyMethodBinding.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LegacyMethodBinding.java Wed Nov 10 08:02:53 2010
@@ -1,83 +1,83 @@
- /*
- * 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.
- */
- package org.apache.myfaces.trinidadinternal.facelets;
-
-import java.io.Serializable;
-
-import javax.el.ELException;
-import javax.el.MethodExpression;
-import javax.faces.context.FacesContext;
-import javax.faces.el.EvaluationException;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.MethodNotFoundException;
-
-/**
- * For legacy ActionSources
- *
- * Implementation copied from Facelets 1.1.14, as it got hidden by JSF 2.0
- * @deprecated
- */
-public final class LegacyMethodBinding extends
- MethodBinding implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final MethodExpression m;
-
- public LegacyMethodBinding(MethodExpression m) {
- this.m = m;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see javax.faces.el.MethodBinding#getType(javax.faces.context.FacesContext)
- */
- public Class getType(FacesContext context)
- throws MethodNotFoundException {
- try {
- return m.getMethodInfo(context.getELContext()).getReturnType();
- } catch (javax.el.MethodNotFoundException e) {
- throw new MethodNotFoundException(e.getMessage(), e.getCause());
- } catch (ELException e) {
- throw new EvaluationException(e.getMessage(), e.getCause());
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see javax.faces.el.MethodBinding#invoke(javax.faces.context.FacesContext,
- * java.lang.Object[])
- */
- public Object invoke(FacesContext context, Object[] params)
- throws EvaluationException, MethodNotFoundException {
- try {
- return m.invoke(context.getELContext(), params);
- } catch (javax.el.MethodNotFoundException e) {
- throw new MethodNotFoundException(e.getMessage(), e.getCause());
- } catch (ELException e) {
- throw new EvaluationException(e.getMessage(), e.getCause());
- }
- }
-
- public String getExpressionString() {
- return m.getExpressionString();
- }
-}
+ /*
+ * 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.
+ */
+ package org.apache.myfaces.trinidadinternal.facelets;
+
+import java.io.Serializable;
+
+import javax.el.ELException;
+import javax.el.MethodExpression;
+import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.MethodNotFoundException;
+
+/**
+ * For legacy ActionSources
+ *
+ * Implementation copied from Facelets 1.1.14, as it got hidden by JSF 2.0
+ * @deprecated
+ */
+public final class LegacyMethodBinding extends
+ MethodBinding implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final MethodExpression m;
+
+ public LegacyMethodBinding(MethodExpression m) {
+ this.m = m;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.faces.el.MethodBinding#getType(javax.faces.context.FacesContext)
+ */
+ public Class getType(FacesContext context)
+ throws MethodNotFoundException {
+ try {
+ return m.getMethodInfo(context.getELContext()).getReturnType();
+ } catch (javax.el.MethodNotFoundException e) {
+ throw new MethodNotFoundException(e.getMessage(), e.getCause());
+ } catch (ELException e) {
+ throw new EvaluationException(e.getMessage(), e.getCause());
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see javax.faces.el.MethodBinding#invoke(javax.faces.context.FacesContext,
+ * java.lang.Object[])
+ */
+ public Object invoke(FacesContext context, Object[] params)
+ throws EvaluationException, MethodNotFoundException {
+ try {
+ return m.invoke(context.getELContext(), params);
+ } catch (javax.el.MethodNotFoundException e) {
+ throw new MethodNotFoundException(e.getMessage(), e.getCause());
+ } catch (ELException e) {
+ throw new EvaluationException(e.getMessage(), e.getCause());
+ }
+ }
+
+ public String getExpressionString() {
+ return m.getExpressionString();
+ }
+}
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/LegacyMethodBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/MethodRule.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/MethodRule.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/MethodRule.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/MethodRule.java Wed Nov 10 08:02:53 2010
@@ -1,32 +1,32 @@
-/*
- * 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.
- */
-package org.apache.myfaces.trinidadinternal.facelets;
-
-
-/**
- * This class has been moved to the API jar.
- * Keeping implementation here for compatibility reasons.
- */
-public final class MethodRule extends org.apache.myfaces.trinidad.facelets.MethodRule {
-
- public MethodRule(String methodName, Class returnTypeClass, Class[] params) {
- super(methodName, returnTypeClass, params);
- }
-
-}
+/*
+ * 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.
+ */
+package org.apache.myfaces.trinidadinternal.facelets;
+
+
+/**
+ * This class has been moved to the API jar.
+ * Keeping implementation here for compatibility reasons.
+ */
+public final class MethodRule extends org.apache.myfaces.trinidad.facelets.MethodRule {
+
+ public MethodRule(String methodName, Class returnTypeClass, Class[] params) {
+ super(methodName, returnTypeClass, params);
+ }
+
+}
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/MethodRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TimezonePropertyTagRule.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TimezonePropertyTagRule.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TimezonePropertyTagRule.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TimezonePropertyTagRule.java Wed Nov 10 08:02:53 2010
@@ -1,95 +1,95 @@
-/*
- * 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.
- */
-package org.apache.myfaces.trinidadinternal.facelets;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import java.util.TimeZone;
-
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
-import javax.faces.view.facelets.TagAttributeException;
-
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-
-
-class TimezonePropertyTagRule
- extends MetaRule
-{
- static TimezonePropertyTagRule Instance = new TimezonePropertyTagRule();
-
- private static class LiteralPropertyMetadata extends Metadata
- {
- public LiteralPropertyMetadata(Method method, TagAttribute attribute)
- {
- _method = method;
- _attribute = attribute;
- }
-
- public void applyMetadata(FaceletContext ctx, Object instance)
- {
- if (_params == null)
- {
- TimeZone tz = TimeZone.getTimeZone(_attribute.getValue());
- _params = new Object[]{tz};
- }
- try
- {
- _method.invoke(instance, _params);
- }
- catch (InvocationTargetException e)
- {
- throw new TagAttributeException(_attribute, e.getCause());
- }
- catch (Exception e)
- {
- throw new TagAttributeException(_attribute, e);
- }
- }
-
- private final Method _method;
- private final TagAttribute _attribute;
- private Object[] _params;
- }
-
- public Metadata applyRule(String name, TagAttribute attribute,
- MetadataTarget meta)
- {
- if (meta.getPropertyType(name) == _TIMEZONE_TYPE && attribute.isLiteral())
- {
- Method m = meta.getWriteMethod(name);
-
- // if the property is writable
- if (m != null)
- {
- return new LiteralPropertyMetadata(m, attribute);
- }
- }
-
- return null;
- }
-
- static private final Class<? extends TimeZone> _TIMEZONE_TYPE = TimeZone.class;
-
- static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(TimezonePropertyTagRule.class);
-}
+/*
+ * 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.
+ */
+package org.apache.myfaces.trinidadinternal.facelets;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import java.util.TimeZone;
+
+import javax.faces.view.facelets.FaceletContext;
+import javax.faces.view.facelets.MetaRule;
+import javax.faces.view.facelets.Metadata;
+import javax.faces.view.facelets.MetadataTarget;
+import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.TagAttributeException;
+
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+
+
+class TimezonePropertyTagRule
+ extends MetaRule
+{
+ static TimezonePropertyTagRule Instance = new TimezonePropertyTagRule();
+
+ private static class LiteralPropertyMetadata extends Metadata
+ {
+ public LiteralPropertyMetadata(Method method, TagAttribute attribute)
+ {
+ _method = method;
+ _attribute = attribute;
+ }
+
+ public void applyMetadata(FaceletContext ctx, Object instance)
+ {
+ if (_params == null)
+ {
+ TimeZone tz = TimeZone.getTimeZone(_attribute.getValue());
+ _params = new Object[]{tz};
+ }
+ try
+ {
+ _method.invoke(instance, _params);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new TagAttributeException(_attribute, e.getCause());
+ }
+ catch (Exception e)
+ {
+ throw new TagAttributeException(_attribute, e);
+ }
+ }
+
+ private final Method _method;
+ private final TagAttribute _attribute;
+ private Object[] _params;
+ }
+
+ public Metadata applyRule(String name, TagAttribute attribute,
+ MetadataTarget meta)
+ {
+ if (meta.getPropertyType(name) == _TIMEZONE_TYPE && attribute.isLiteral())
+ {
+ Method m = meta.getWriteMethod(name);
+
+ // if the property is writable
+ if (m != null)
+ {
+ return new LiteralPropertyMetadata(m, attribute);
+ }
+ }
+
+ return null;
+ }
+
+ static private final Class<? extends TimeZone> _TIMEZONE_TYPE = TimeZone.class;
+
+ static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(TimezonePropertyTagRule.class);
+}
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/TimezonePropertyTagRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java?rev=1033387&r1=1033386&r2=1033387&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java Wed Nov 10 08:02:53 2010
@@ -1,231 +1,231 @@
-/*
- * 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.
- */
-package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
-
-import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
-
-/**
- * Class that contains misc constants used by several renderers.
- * Class contains details about events, parameters and other useful stuff.
- */
-public final class TrinidadRenderingConstants
-{
- private TrinidadRenderingConstants(){}
-
- // Input components
- public static final String AUTOSUBMIT_EVENT = "autosub";
-
- // Mobile dateField and LovField
- // "picker" events and types
- public static final String DATE_EVENT = "date";
- public static final String CANCEL_EVENT = "cancel";
- public static final String TYPE_POST = "post";
-
- // NavigationBar
- public static final String GOTO_EVENT = "goto";
-
- // HideShow
- public static final String HIDE_EVENT = "hide";
- public static final String SHOW_EVENT = "show";
-
- // HGrid
- public static final int INCOMPLETE_DATA_SET = -1;
-
- // SortableHeader
- public static final String SORT_EVENT = "sort";
-
- // Poll
- public static final String POLL_EVENT = "poll";
-
- // Chart Drill down
- public static final String CHART_DRILL_DOWN_EVENT = "chartDrillDown";
-
- /**
- * Constant for the value of the "value" event parameter when
- * the user is asking to see all rows.
- */
- public static final String VALUE_SHOW_ALL = "all";
-
- //
- // Context Property Names
- //
- /**
- * String rendering property for the name of the current form bean.
- */
- public static final String FORM_NAME_PROPERTY = "formName";
-
- /**
- * Key used to store the initialFocus on the RenderingContext
- * under the UIConstants.MARLIN_NAMESPACE. initialFocus is an attribute
- * of body and is an id indicating the component
- * which should have the initial focus.
- */
- public static final Object INITIAL_FOCUS_CONTEXT_PROPERTY = "initialFocus";
-
- //
- // parameter names
- //
- public static final String PARTIAL_PARAM = "partial";
- public static final String PARTIAL_TARGETS_PARAM = "partialTargets";
- public static final String SIZE_PARAM = "size";
- public static final String SOURCE_PARAM = "source";
- public static final String STATE_PARAM = "state";
- public static final String TYPE_PARAM = "type";
- public static final String VALUE_PARAM = "value";
- public static final String TARGETITEM_PARAM = "targetItem";
-
- //
- // parameter values
- //
- // calendar, mobile dateField params
- public static final String EVENT_PARAM = "event";
- public static final String LOC_PARAM = "loc";
- public static final String MAX_VALUE_PARAM = "maxValue";
- public static final String MIN_VALUE_PARAM = "minValue";
- public static final String MONTH_PARAM = "month";
- public static final String SCROLLED_VALUE_PARAM = "scrolledValue";
- public static final String YEAR_PARAM = "year";
-
- //
- // Named Children
- //
- public static final String PATH_STAMP_CHILD = "pathStamp";
-
- // MAX_VALUE_ATTR
- public static final int MAX_VALUE_UNKNOWN = -1;
-
- // MESSAGE_TYPE_ATTR
- /**
- * Message type if the associated message is informational.
- */
- public static final String MESSAGE_TYPE_INFO = "info";
-
- /**
- * Message type if the associated message is a warning.
- */
- public static final String MESSAGE_TYPE_WARNING = "warning";
-
- /**
- * Message type if the associated message is an error.
- */
- public static final String MESSAGE_TYPE_ERROR = "error";
-
- /**
- * Message type if the associated message is a confirmation.
- */
- public static final String MESSAGE_TYPE_CONFIRMATION = "confirmation";
-
- /**
- * Message type if the page layout messageType is processing.
- */
- public static final String MESSAGE_TYPE_PROCESSING = "processing";
-
- /**
- * Message type if there is no type of message.
- */
- public static final String MESSAGE_TYPE_NONE = "none";
-
- // SORTABLE_ATTR
- /**
- * Sortable value if the table column is sortable and is currently
- * sorted with ascending values down the column.
- */
- public static final String SORTABLE_ASCENDING = "ascending";
-
- /**
- * Sortable value if the table column is sortable and is currently
- * sorted with descending values down the column.
- */
- public static final String SORTABLE_DESCENDING = "descending";
-
- /**
- * The default text used for a secret field.
- * When working with password fields, compare the value submitted
- * with this value. If they are the same, then the user did not modify
- * the field.
- */
- public static final String SECRET_FIELD_DEFAULT_VALUE = "******";
-
- // ORIENTATION_ATTR
- /**
- * Value to indicate orientation is vertical (currently used by BreadCrumbs)
- */
- public final static String ORIENTATION_VERTICAL="vertical";
-
- public static final String SELECTED_KEY = "selected";
-
- // ===================== End of copy from UIConstants =======================
-
- public static final String STYLES_CACHE_DIRECTORY = "/adf/styles/cache/";
- public static final String OUTPUT_MODE_PORTLET = org.apache.myfaces.trinidad.render.XhtmlConstants.FACET_PORTLET;
-
- //
- // Copied from BaseDesktopConstants
- //
- public static final String BASE_DESKTOP_ID = "base.desktop";
-
- //
- // Copied from XhtmlLafConstants
- //
- public static final String APACHE_TRINIDAD_DESKTOP =
- "org.apache.myfaces.trinidad.desktop";
- public static final String APACHE_TRINIDAD_PDA =
- "org.apache.myfaces.trinidad.pda";
- public static final String APACHE_TRINIDAD_PORTLET =
- CoreRenderKit.OUTPUT_MODE_PORTLET;
-
- // skin family names constants
- public static final String CASABLANCA_SKIN_FAMILY = "casablanca";
- public static final String MINIMAL_SKIN_FAMILY = "minimal";
-
- public static final String COLOR_PALETTE_TRANSPARENT_ICON_NAME = "cpt.gif";
-
- // 'xc' stands for uiX Composite
- // -= Simon =-
- // FIXME: Should it be renamed to remove UIX reference?
- public static final String COMPOSITE_ID_EXTENSION = "__xc_";
-
- // context property to indicate that form elements are repeated and the
- // data needs to be kept in sync
- public static final Object REPEAT_PROPERTY = new Object();
-
- //Constants for Non JavaScript browser support
- public static final String NO_JS_PARAMETER_KEY = "_parameterkey";
- public static final String NO_JS_INPUT_IMAGE_KEY = "_inputImagekey";
- public static final String MULTIPLE_VALUE_PARAM = "multipleValueParam";
- public static final String NO_JS_PARAMETER_KEY_BUTTON = "Go";
- public static final String NO_JS_PARAMETER_BACK_BUTTON = "Back";
- public static final String NO_JS_PARAMETER_NEXT_BUTTON = "Next";
-
- public static final String NON_JS_BROWSER = "_noJavaScript";
- public static final String NON_JS_BROWSER_TRUE = "true";
- public static final String NON_JS_DETAIL_DISCLOSED_ICON = "-";
- public static final String NON_JS_DETAIL_UNDISCLOSED_ICON = "+";
- public static final String NON_JS_ASC_ICON = "v";
- public static final String NON_JS_DESC_ICON = "^";
-
- // Maximum width of a narrow-screen PDA device in pixels
- public static final int NARROW_SCREEN_PDA_MAX_WIDTH = 240;
-
- // The name of the hidden parameter that stores the value of the
- // request-header, UA-pixels. This hidden paramter is rendered only
- // for windows mobile.
- public static final String WINDOWS_MOBILE_UAPIXELS = "uapixels";
-
+/*
+ * 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.
+ */
+package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
+
+import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderKit;
+
+/**
+ * Class that contains misc constants used by several renderers.
+ * Class contains details about events, parameters and other useful stuff.
+ */
+public final class TrinidadRenderingConstants
+{
+ private TrinidadRenderingConstants(){}
+
+ // Input components
+ public static final String AUTOSUBMIT_EVENT = "autosub";
+
+ // Mobile dateField and LovField
+ // "picker" events and types
+ public static final String DATE_EVENT = "date";
+ public static final String CANCEL_EVENT = "cancel";
+ public static final String TYPE_POST = "post";
+
+ // NavigationBar
+ public static final String GOTO_EVENT = "goto";
+
+ // HideShow
+ public static final String HIDE_EVENT = "hide";
+ public static final String SHOW_EVENT = "show";
+
+ // HGrid
+ public static final int INCOMPLETE_DATA_SET = -1;
+
+ // SortableHeader
+ public static final String SORT_EVENT = "sort";
+
+ // Poll
+ public static final String POLL_EVENT = "poll";
+
+ // Chart Drill down
+ public static final String CHART_DRILL_DOWN_EVENT = "chartDrillDown";
+
+ /**
+ * Constant for the value of the "value" event parameter when
+ * the user is asking to see all rows.
+ */
+ public static final String VALUE_SHOW_ALL = "all";
+
+ //
+ // Context Property Names
+ //
+ /**
+ * String rendering property for the name of the current form bean.
+ */
+ public static final String FORM_NAME_PROPERTY = "formName";
+
+ /**
+ * Key used to store the initialFocus on the RenderingContext
+ * under the UIConstants.MARLIN_NAMESPACE. initialFocus is an attribute
+ * of body and is an id indicating the component
+ * which should have the initial focus.
+ */
+ public static final Object INITIAL_FOCUS_CONTEXT_PROPERTY = "initialFocus";
+
+ //
+ // parameter names
+ //
+ public static final String PARTIAL_PARAM = "partial";
+ public static final String PARTIAL_TARGETS_PARAM = "partialTargets";
+ public static final String SIZE_PARAM = "size";
+ public static final String SOURCE_PARAM = "source";
+ public static final String STATE_PARAM = "state";
+ public static final String TYPE_PARAM = "type";
+ public static final String VALUE_PARAM = "value";
+ public static final String TARGETITEM_PARAM = "targetItem";
+
+ //
+ // parameter values
+ //
+ // calendar, mobile dateField params
+ public static final String EVENT_PARAM = "event";
+ public static final String LOC_PARAM = "loc";
+ public static final String MAX_VALUE_PARAM = "maxValue";
+ public static final String MIN_VALUE_PARAM = "minValue";
+ public static final String MONTH_PARAM = "month";
+ public static final String SCROLLED_VALUE_PARAM = "scrolledValue";
+ public static final String YEAR_PARAM = "year";
+
+ //
+ // Named Children
+ //
+ public static final String PATH_STAMP_CHILD = "pathStamp";
+
+ // MAX_VALUE_ATTR
+ public static final int MAX_VALUE_UNKNOWN = -1;
+
+ // MESSAGE_TYPE_ATTR
+ /**
+ * Message type if the associated message is informational.
+ */
+ public static final String MESSAGE_TYPE_INFO = "info";
+
+ /**
+ * Message type if the associated message is a warning.
+ */
+ public static final String MESSAGE_TYPE_WARNING = "warning";
+
+ /**
+ * Message type if the associated message is an error.
+ */
+ public static final String MESSAGE_TYPE_ERROR = "error";
+
+ /**
+ * Message type if the associated message is a confirmation.
+ */
+ public static final String MESSAGE_TYPE_CONFIRMATION = "confirmation";
+
+ /**
+ * Message type if the page layout messageType is processing.
+ */
+ public static final String MESSAGE_TYPE_PROCESSING = "processing";
+
+ /**
+ * Message type if there is no type of message.
+ */
+ public static final String MESSAGE_TYPE_NONE = "none";
+
+ // SORTABLE_ATTR
+ /**
+ * Sortable value if the table column is sortable and is currently
+ * sorted with ascending values down the column.
+ */
+ public static final String SORTABLE_ASCENDING = "ascending";
+
+ /**
+ * Sortable value if the table column is sortable and is currently
+ * sorted with descending values down the column.
+ */
+ public static final String SORTABLE_DESCENDING = "descending";
+
+ /**
+ * The default text used for a secret field.
+ * When working with password fields, compare the value submitted
+ * with this value. If they are the same, then the user did not modify
+ * the field.
+ */
+ public static final String SECRET_FIELD_DEFAULT_VALUE = "******";
+
+ // ORIENTATION_ATTR
+ /**
+ * Value to indicate orientation is vertical (currently used by BreadCrumbs)
+ */
+ public final static String ORIENTATION_VERTICAL="vertical";
+
+ public static final String SELECTED_KEY = "selected";
+
+ // ===================== End of copy from UIConstants =======================
+
+ public static final String STYLES_CACHE_DIRECTORY = "/adf/styles/cache/";
+ public static final String OUTPUT_MODE_PORTLET = org.apache.myfaces.trinidad.render.XhtmlConstants.FACET_PORTLET;
+
+ //
+ // Copied from BaseDesktopConstants
+ //
+ public static final String BASE_DESKTOP_ID = "base.desktop";
+
+ //
+ // Copied from XhtmlLafConstants
+ //
+ public static final String APACHE_TRINIDAD_DESKTOP =
+ "org.apache.myfaces.trinidad.desktop";
+ public static final String APACHE_TRINIDAD_PDA =
+ "org.apache.myfaces.trinidad.pda";
+ public static final String APACHE_TRINIDAD_PORTLET =
+ CoreRenderKit.OUTPUT_MODE_PORTLET;
+
+ // skin family names constants
+ public static final String CASABLANCA_SKIN_FAMILY = "casablanca";
+ public static final String MINIMAL_SKIN_FAMILY = "minimal";
+
+ public static final String COLOR_PALETTE_TRANSPARENT_ICON_NAME = "cpt.gif";
+
+ // 'xc' stands for uiX Composite
+ // -= Simon =-
+ // FIXME: Should it be renamed to remove UIX reference?
+ public static final String COMPOSITE_ID_EXTENSION = "__xc_";
+
+ // context property to indicate that form elements are repeated and the
+ // data needs to be kept in sync
+ public static final Object REPEAT_PROPERTY = new Object();
+
+ //Constants for Non JavaScript browser support
+ public static final String NO_JS_PARAMETER_KEY = "_parameterkey";
+ public static final String NO_JS_INPUT_IMAGE_KEY = "_inputImagekey";
+ public static final String MULTIPLE_VALUE_PARAM = "multipleValueParam";
+ public static final String NO_JS_PARAMETER_KEY_BUTTON = "Go";
+ public static final String NO_JS_PARAMETER_BACK_BUTTON = "Back";
+ public static final String NO_JS_PARAMETER_NEXT_BUTTON = "Next";
+
+ public static final String NON_JS_BROWSER = "_noJavaScript";
+ public static final String NON_JS_BROWSER_TRUE = "true";
+ public static final String NON_JS_DETAIL_DISCLOSED_ICON = "-";
+ public static final String NON_JS_DETAIL_UNDISCLOSED_ICON = "+";
+ public static final String NON_JS_ASC_ICON = "v";
+ public static final String NON_JS_DESC_ICON = "^";
+
+ // Maximum width of a narrow-screen PDA device in pixels
+ public static final int NARROW_SCREEN_PDA_MAX_WIDTH = 240;
+
+ // The name of the hidden parameter that stores the value of the
+ // request-header, UA-pixels. This hidden paramter is rendered only
+ // for windows mobile.
+ public static final String WINDOWS_MOBILE_UAPIXELS = "uapixels";
+
}
\ No newline at end of file
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TrinidadRenderingConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LoggerBundle_en.java
------------------------------------------------------------------------------
svn:eol-style = native