You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/02/04 22:52:21 UTC
svn commit: r374936 [13/14] - in /incubator/tobago/trunk: tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/api/
tobago-core/src/main/java/org/apache/myfaces/tobago/application/ t...
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INLINE;
@@ -42,7 +44,8 @@
UIInput uiInput = (UIInput) component;
- String newValue = (String)facesContext.getExternalContext().getRequestParameterMap()
+ String newValue = (String)
+ facesContext.getExternalContext().getRequestParameterMap()
.get(uiInput.getClientId(facesContext));
// LogUtils.logParameter(((ServletRequest)facesContext.getExternalContext().getRequest()));
// LOG.debug("decode: key='" + uiInput.getClientId(facesContext)
@@ -66,7 +69,7 @@
boolean inline = ComponentUtil.getBooleanAttribute(component, ATTR_INLINE);
- if (label != null && ! inline) {
+ if (label != null && !inline) {
writer.startElement("table", component);
writer.writeAttribute("border", "0", null);
@@ -79,7 +82,7 @@
writer.startElement("td", null);
}
- Boolean currentValue = (Boolean)component.getValue();
+ Boolean currentValue = (Boolean) component.getValue();
boolean checked = currentValue != null ? currentValue.booleanValue() : false;
writer.startElement("input", component);
@@ -94,7 +97,7 @@
writer.writeAttribute("title", null, ATTR_TIP);
writer.endElement("input");
- if (label != null && ! inline) {
+ if (label != null && !inline) {
writer.endElement("td");
writer.startElement("td", null);
writer.writeText("", null);
@@ -104,16 +107,11 @@
RenderUtil.encode(facesContext, label);
}
- if (label != null && ! inline) {
+ if (label != null && !inline) {
writer.endElement("td");
writer.endElement("tr");
writer.endElement("table");
}
-
-
}
-
-// ///////////////////////////////////////////// bean getter + setter
-
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectItemsRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectItemsRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectItemsRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectItemsRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.myfaces.tobago.renderkit.RendererBase;
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -37,20 +39,14 @@
public class SelectManyCheckboxRenderer extends SelectManyRendererBase {
-// ///////////////////////////////////////////// constant
private static final Log LOG = LogFactory.getLog(SelectManyCheckboxRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
public void encodeEndTobago(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
- UISelectMany component = (UISelectMany)uiComponent;
+ UISelectMany component = (UISelectMany) uiComponent;
List<SelectItem> items = ComponentUtil.getItemsToRender(component);
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,16 +40,8 @@
public class SelectManyListboxRenderer extends SelectManyRendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(SelectManyListboxRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public boolean getRendersChildren() {
return true;
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,16 +41,9 @@
public class SelectOneChoiceRenderer extends SelectOneRendererBase {
-// ///////////////////////////////////////////// constant
private static final Log LOG = LogFactory.getLog(SelectOneChoiceRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public boolean getRendersChildren() {
return true;
@@ -56,7 +51,7 @@
protected void renderMain(FacesContext facesContext, UIComponent uiComponent,
TobagoResponseWriter writer) throws IOException {
- UISelectOne component = (UISelectOne)uiComponent;
+ UISelectOne component = (UISelectOne) uiComponent;
List<SelectItem> items = ComponentUtil.getSelectItems(component);
if (LOG.isDebugEnabled()) {
@@ -111,7 +106,6 @@
return space;
}
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,15 +40,7 @@
public class SelectOneListboxRenderer extends SelectOneRendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(SelectOneListboxRenderer.class);
-
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
public boolean getRendersChildren() {
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,15 +43,8 @@
public class SelectOneRadioRenderer extends SelectOneRendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(SelectOneRadioRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
protected void renderMain(FacesContext facesContext, UIComponent input,
TobagoResponseWriter writer) throws IOException {
@@ -86,7 +81,7 @@
TobagoResponseWriter writer
= (TobagoResponseWriter) facesContext.getResponseWriter();
- if (! inline) {
+ if (!inline) {
writer.startElement("table", component);
writer.writeAttribute("border", "0", null);
writer.writeAttribute("cellspacing", "0", null);
@@ -98,7 +93,7 @@
Object value = component.getValue();
for (SelectItem item : items) {
- if (! inline) {
+ if (!inline) {
writer.startElement("tr", null);
writer.startElement("td", null);
}
@@ -129,7 +124,7 @@
if (item.getLabel() != null) {
- if (! inline) {
+ if (!inline) {
writer.endElement("td");
writer.startElement("td", null);
}
@@ -152,12 +147,12 @@
// RenderUtil.encode(label);
}
- if (! inline) {
+ if (!inline) {
writer.endElement("td");
writer.endElement("tr");
}
}
- if (! inline) {
+ if (!inline) {
writer.endElement("table");
}
}
@@ -167,7 +162,6 @@
= ComponentUtil.getItemsToRender((UISelectOne) component);
return items.size() * super.getFixedHeight(facesContext, component);
}
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -307,11 +309,10 @@
// Print the Content
if (LOG.isDebugEnabled()) {
- LOG.debug("first = " + data.getFirst() + " rows = " +
- data.getRows());
+ LOG.debug("first = " + data.getFirst() + " rows = " + data.getRows());
}
- final Map requestMap = facesContext.getExternalContext().getRequestMap();
+ //final Map requestMap = facesContext.getExternalContext().getRequestMap();
final String var = data.getVar();
boolean odd = false;
@@ -324,8 +325,7 @@
break;
}
odd = !odd;
- final String rowClass = odd ?
- "tobago-sheet-content-odd " : "tobago-sheet-content-even ";
+ final String rowClass = odd ? "tobago-sheet-content-odd " : "tobago-sheet-content-even ";
if (LOG.isDebugEnabled()) {
LOG.debug("var " + var);
@@ -359,8 +359,8 @@
}
final String cellClass = (String) column.getAttributes().get(
ATTR_STYLE_CLASS);
- final String tdClass = "tobago-sheet-cell-td " +
- (cellClass != null ? cellClass : "");
+ final String tdClass = "tobago-sheet-cell-td "
+ + (cellClass != null ? cellClass : "");
writer.startElement("td", column);
@@ -695,8 +695,8 @@
}
private boolean isValidPagingValue(String value) {
- return "left".equals(value) || "center".equals(value) ||
- "right".equals(value);
+ return "left".equals(value) || "center".equals(value)
+ || "right".equals(value);
}
private int getAscendingMarkerWidth(FacesContext facesContext,
@@ -761,7 +761,7 @@
+ (disabled ? " tobago-sheet-footer-pager-button-disabled" : ""));
writer.writeAttribute("src", image, null);
writer.writeAttribute("title", tip, null);
- if (! disabled) {
+ if (!disabled) {
String onClick = ButtonRenderer.createOnClick(facesContext, link);
writer.writeAttribute("onclick", onClick, null);
}
@@ -778,9 +778,8 @@
List columnWidths
= (List) component.getAttributes().get(ATTR_WIDTH_LIST);
- String divWidth = "width: " +
- (((Integer) columnWidths.get(columnCount)).intValue()) +
- "px;";
+ String divWidth =
+ "width: " + (((Integer) columnWidths.get(columnCount)).intValue()) + "px;";
writer.startElement("div", null);
@@ -801,8 +800,7 @@
String sorterId = Sorter.ID_PREFIX + columnCount;
String onclick = "submitAction('"
+ ComponentUtil.findPage(component).getFormId(facesContext)
- + "','" + component.getClientId(facesContext) + ":" + sorterId +
- "')";
+ + "','" + component.getClientId(facesContext) + ":" + sorterId + "')";
writer.writeAttribute("onclick", onclick, null);
UICommand sortCommand = (UICommand)
application.createComponent(UICommand.COMPONENT_TYPE);
@@ -948,7 +946,8 @@
= (String) column.getAttributes().get(ATTR_LABEL);
if (label != null) {
writer.writeText(label, null);
- if (((UIData)column.getParent()).getSheetState(facesContext).getSortedColumn() == columnCount && "right".equals(align)) {
+ if (((UIData) column.getParent()).getSheetState(facesContext).getSortedColumn()
+ == columnCount && "right".equals(align)) {
writer.startElement("img", null);
writer.writeAttribute("src", image1x1, null);
writer.writeAttribute("alt", "", null);
@@ -998,8 +997,8 @@
}
}
- if (prevs.size() > (linkCount / 2) &&
- nexts.size() > (linkCount - (linkCount / 2))) {
+ if (prevs.size() > (linkCount / 2)
+ && nexts.size() > (linkCount - (linkCount / 2))) {
while (prevs.size() > (linkCount / 2)) {
prevs.remove(0);
}
@@ -1100,8 +1099,6 @@
renderSheet(facesContext, (UIData) component);
facesContext.responseComplete();
}
-
-// -------------------------------------------------------------- inner classes
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,14 +31,7 @@
public class SubviewRenderer extends RendererBase {
-// ///////////////////////////////////////////// constant
private static final Log LOG = LogFactory.getLog(SubviewRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public void encodeBegin(FacesContext facesContext, UIComponent component)
throws IOException {
@@ -47,16 +42,7 @@
public void encodeEndTobago(FacesContext facesContext,
UIComponent component) throws IOException {
- //ResponseWriter writer = facesContext.getResponseWriter();
-
- //BodyContentHandler bodyContentHandler = (BodyContentHandler)
- // component.getAttributes().get(ATTR_BODY_CONTENT);
- //if (bodyContentHandler != null) {
- // writer.write(bodyContentHandler.getBodyContent());
- //}
-
}
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -63,18 +65,11 @@
public class TabGroupRenderer extends RendererBase implements AjaxRenderer {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(TabGroupRenderer.class);
public static final String ACTIVE_INDEX_POSTFIX
= SUBCOMPONENT_SEP + "activeIndex";
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
public void decode(FacesContext facesContext, UIComponent component) {
if (ComponentUtil.isOutputOnly(component)) {
return;
@@ -85,7 +80,7 @@
String clientId = component.getClientId(facesContext);
final Map parameters
= facesContext.getExternalContext().getRequestParameterMap();
- String newValue = (String)parameters.get(clientId + ACTIVE_INDEX_POSTFIX);
+ String newValue = (String) parameters.get(clientId + ACTIVE_INDEX_POSTFIX);
try {
int activeIndex = Integer.parseInt(newValue);
if (activeIndex != oldIndex) {
@@ -112,7 +107,7 @@
String image1x1
= ResourceManagerUtil.getImageWithPath(facesContext, "image/1x1.gif");
- UIPanel[] tabs = component.getTabs();
+ UIPanel[] tabs = component.getTabs();
layoutTabs(facesContext, component, tabs);
final int activeIndex = component.getActiveIndex();
@@ -253,12 +248,12 @@
writer.writeClassAttribute("tobago-tab-link");
writer.writeIdAttribute(clientId + "." + virtualTab + SUBCOMPONENT_SEP + i);
writer.writeAttribute("href", url, null);
- if (label.getAccessKey() != null) {
- if (LOG.isWarnEnabled() && ! AccessKeyMap.addAccessKey(
- facesContext, label.getAccessKey())) {
- LOG.warn("dublicated accessKey : " + label.getAccessKey());
+ if (label.getAccessKey1() != null) {
+ if (LOG.isWarnEnabled()
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
+ LOG.warn("dublicated accessKey : " + label.getAccessKey1());
}
- writer.writeAttribute("accesskey", label.getAccessKey(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey1(), null);
// writer.writeAttribute("onfocus", "this.click();", null);
}
if (label.getText() != null) {
@@ -293,22 +288,21 @@
writer.endElement("td");
writer.endElement("tr");
-
-
encodeContent(writer, facesContext, activeTab);
-
writer.endElement("table");
}
- protected void encodeContent(TobagoResponseWriter writer, FacesContext facesContext, UIPanel activeTab) throws IOException {
+ protected void encodeContent(TobagoResponseWriter writer,
+ FacesContext facesContext, UIPanel activeTab) throws IOException {
String bodyStyle = (String)
activeTab.getParent().getAttributes().get(ATTR_STYLE_BODY);
writer.startElement("tr", null);
writer.startElement("td", null);
writer.writeClassAttribute("tobago-tab-content");
- writer.writeAttribute("style", bodyStyle, null);writer.writeText("", null);
+ writer.writeAttribute("style", bodyStyle, null);
+ writer.writeText("", null);
RenderUtil.encodeChildren(facesContext, activeTab);
writer.endElement("td");
writer.endElement("tr");
@@ -318,9 +312,9 @@
AjaxUtils.checkParamValidity(context, component, UITabGroup.class);
renderTabGroupView(context,
- (TobagoResponseWriter)context.getResponseWriter(),
- (UITabGroup)component,
- ((UITabGroup)component).getActiveIndex(),
+ (TobagoResponseWriter) context.getResponseWriter(),
+ (UITabGroup) component,
+ ((UITabGroup) component).getActiveIndex(),
new StyleAttribute((String) component.getAttributes().get(ATTR_STYLE)),
SWITCH_TYPE_RELOAD_TAB,
ResourceManagerUtil.getImageWithPath(context, "image/1x1.gif"));
@@ -369,17 +363,16 @@
}
-// ///////////////////////////////////////////// bean getter + setter
public class TabController extends MethodBinding {
public static final String ID_PREFIX = "tab_";
public Object invoke(FacesContext facesContext, Object[] objects)
- throws EvaluationException, MethodNotFoundException {
+ throws EvaluationException {
if (objects[0] instanceof ActionEvent) {
- UICommand command = (UICommand) ((ActionEvent)objects[0]).getSource();
+ UICommand command = (UICommand) ((ActionEvent) objects[0]).getSource();
if (LOG.isDebugEnabled()) {
LOG.debug("Id = " + command.getId());
}
@@ -388,9 +381,8 @@
try {
int newTab =
Integer.parseInt(command.getId().substring(ID_PREFIX.length()));
- }
- catch (Exception e) {
-
+ } catch (Exception e) {
+ // ignore
}
}
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_READONLY;
@@ -37,12 +39,6 @@
import java.util.Iterator;
public class TextAreaRenderer extends InRendererBase {
-
-
-
-// ----------------------------------------------------------- business methods
-
-
protected void renderMain(FacesContext facesContext, UIInput input,
TobagoResponseWriter writer) throws IOException {
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id: InRenderer.java 1361 2005-08-15 11:46:20 +0200 (Mon, 15 Aug 2005) lofwyr $
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 28.04.2003 at 15:29:36.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -71,14 +73,8 @@
public class ToolBarRenderer extends RendererBase {
-// ------------------------------------------------------------------ constants
-
private static final Log LOG = LogFactory.getLog(ToolBarRenderer.class);
-// ----------------------------------------------------------------- interfaces
-
-
-// ---------------------------- interface TobagoRenderer
public void encodeEndTobago(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
@@ -196,7 +192,7 @@
String image = null;
if (item instanceof org.apache.myfaces.tobago.model.SelectItem) {
- image = ((org.apache.myfaces.tobago.model.SelectItem)item).getImage();
+ image = ((org.apache.myfaces.tobago.model.SelectItem) item).getImage();
} else if (LOG.isDebugEnabled()) {
LOG.debug("select item is not " + org.apache.myfaces.tobago.model.SelectItem.class.getName());
}
@@ -295,7 +291,7 @@
String graphicId = clientId + SUBCOMPONENT_SEP + "icon";
String extraHoverClass = "";
- if (addExtraHoverClass == true) {
+ if (addExtraHoverClass) {
if (!boxFacet) {
extraHoverClass = " tobago-toolBar-button-hover-first";
} else {
@@ -323,11 +319,9 @@
writer.writeClassAttribute(tableClasses);
writer.startElement("tr", null);
-
boolean anchorOnLabel =
label.getText() != null && !ToolBarTag.LABEL_OFF.equals(labelPosition);
-
if (!ToolBarTag.ICON_OFF.equals(iconSize)) {
if (iconName != null) {
ImageRenderer.addImageSources(facesContext,
@@ -344,9 +338,10 @@
&& label.getText() != null));
- if (((!ToolBarTag.LABEL_OFF.equals(labelPosition) &&
- label.getText() != null)
- || popupMenu != null) && !render1pxImage) {
+ if (((!ToolBarTag.LABEL_OFF.equals(labelPosition)
+ && label.getText() != null)
+ || popupMenu != null)
+ && !render1pxImage) {
writer.writeAttribute("style", "padding-right: 3px;", null);
// TODO: make this '3px' configurable
}
@@ -394,7 +389,6 @@
writer.writeAttribute("style", "padding-right: 3px;", null);
// TODO: make this '3px' configurable
}
-
if (label.getText() != null) {
renderAnchorBegin(facesContext, writer, command, label, disabled);
HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
@@ -402,8 +396,6 @@
}
writer.endElement("td");
}
-
-
if (!popupOn2 && popupMenu != null) {
renderPopupTd(facesContext, writer, command, popupMenu,
false);
@@ -504,12 +496,12 @@
if (!disabled) {
writer.writeAttribute("href", "#", null);
writer.writeAttribute("onfocus", "tobagoToolbarFocus(this, event)", null);
- if (label.getAccessKey() != null) {
+ if (label.getAccessKey1() != null) {
if (LOG.isInfoEnabled()
- && ! AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
- LOG.info("dublicated accessKey : " + label.getAccessKey());
+ && !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey1())) {
+ LOG.info("dublicated accessKey : " + label.getAccessKey1());
}
- writer.writeAttribute("accesskey", label.getAccessKey(), null);
+ writer.writeAttribute("accesskey", label.getAccessKey1(), null);
}
}
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,7 +46,7 @@
public void encodeEndTobago(FacesContext facesContext, UIComponent component)
throws IOException {
- int level = ((UITreeListboxBox)component).getLevel();
+ int level = ((UITreeListboxBox) component).getLevel();
UITreeListbox tree = (UITreeListbox) component.getParent();
List<UITreeNode> selectionPath = tree.getSelectionPath();
@@ -72,12 +73,12 @@
if (siblingMode) {
writer.writeAttribute("onchange", onChange, null);
} else {
- writer.writeAttribute("onclick", onClick, null);
+ writer.writeAttribute("onclick", onClick, null);
}
writer.writeAttribute("multiple", siblingMode);
- List nodes = ((UITreeListboxBox)component).getNodes();
+ List nodes = ((UITreeListboxBox) component).getNodes();
for (int i = 0; i < nodes.size(); i++) {
UITreeNode treeNode = (UITreeNode) nodes.get(i);
@@ -97,8 +98,6 @@
}
writer.endElement("option");
}
-
-
writer.endElement("select");
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,22 +38,13 @@
import javax.faces.context.ResponseWriter;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
public class TreeListboxRenderer extends TreeRenderer{
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(TreeListboxRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public void encodeBeginTobago(
FacesContext facesContext, UIComponent component) throws IOException {
@@ -88,7 +81,6 @@
final Set<DefaultMutableTreeNode> selection = tree.getState().getSelection();
- final Iterator<DefaultMutableTreeNode> iterator = selection.iterator();
value = ";";
for (DefaultMutableTreeNode node : selection) {
value += nodeStateId(facesContext, tree.findUITreeNode(root, node)) + ";";
@@ -105,7 +97,7 @@
final String[] scripts = {"script/tree.js"};
ComponentUtil.findPage(tree).getScriptFiles().add(scripts[0]);
- if (! TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
+ if (!TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
HtmlRendererUtil.startJavascript(writer);
writer.writeText(script, null);
HtmlRendererUtil.endJavascript(writer);
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
@@ -46,16 +48,8 @@
public class TreeNodeRenderer extends RendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(TreeNodeRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public void decode(FacesContext facesContext, UIComponent component) {
if (ComponentUtil.isOutputOnly(component)) {
return;
@@ -69,44 +63,43 @@
final Map requestParameterMap
= facesContext.getExternalContext().getRequestParameterMap();
- { // expand state
- String expandState = (String) requestParameterMap.get(treeId);
- String searchString = ";" + nodeId + ";";
- if (expandState.indexOf(searchString) > -1) {
- state.addExpandState((DefaultMutableTreeNode) node.getValue());
- }
+ // expand state
+ String expandState = (String) requestParameterMap.get(treeId);
+ String searchString = ";" + nodeId + ";";
+ if (expandState.indexOf(searchString) > -1) {
+ state.addExpandState((DefaultMutableTreeNode) node.getValue());
}
+
if (TreeRenderer.isSelectable(tree)) { // selection
String selected = (String) requestParameterMap.get(treeId + UITree.SELECT_STATE);
- String searchString = ";" + nodeId + ";";
+ searchString = ";" + nodeId + ";";
if (selected.indexOf(searchString) > -1) {
state.addSelection((DefaultMutableTreeNode) node.getValue());
}
}
- { // marker
- String marked = (String) requestParameterMap.get(treeId + UITree.MARKER);
- if (marked != null) {
- String searchString = treeId + NamingContainer.SEPARATOR_CHAR + nodeId;
+ // marker
+ String marked = (String) requestParameterMap.get(treeId + UITree.MARKER);
+ if (marked != null) {
+ searchString = treeId + NamingContainer.SEPARATOR_CHAR + nodeId;
- if (marked.equals(searchString)) {
- state.setMarker((DefaultMutableTreeNode) node.getValue());
- }
+ if (marked.equals(searchString)) {
+ state.setMarker((DefaultMutableTreeNode) node.getValue());
}
}
+
// link
// FIXME: this is equal to the CommandRendererBase, why not use that code?
String actionId = ComponentUtil.findPage(component).getActionId();
if (LOG.isDebugEnabled()) {
LOG.debug("actionId = '" + actionId + "'");
- LOG.debug("nodeId = '" + treeId + NamingContainer.SEPARATOR_CHAR +
- nodeId +
- "'");
+ LOG.debug("nodeId = '" + treeId + NamingContainer.SEPARATOR_CHAR
+ + nodeId + "'");
}
- if (actionId != null &&
- actionId.equals(treeId + NamingContainer.SEPARATOR_CHAR + nodeId)) {
+ if (actionId != null
+ && actionId.equals(treeId + NamingContainer.SEPARATOR_CHAR + nodeId)) {
UICommand treeNodeCommand
= (UICommand) tree.getFacet(UITree.FACET_TREE_NODE_COMMAND);
if (treeNodeCommand != null) {
@@ -218,7 +211,7 @@
writer.writeText(",'", null);
writer.writeText(rootId, null);
writer.writeText("',", null);
- String selectable = ComponentUtil.getStringAttribute(root, ATTR_SELECTABLE) ;
+ String selectable = ComponentUtil.getStringAttribute(root, ATTR_SELECTABLE);
if (selectable != null
&& (!(selectable.equals("multi") || selectable.equals("multiLeafOnly")
|| selectable.equals("single") || selectable.equals("singleLeafOnly")
@@ -240,7 +233,7 @@
ComponentUtil.findPage(component).getFormId(facesContext), null);
writer.writeText("',", null);
if (component.getChildCount() == 0
- || (selectable != null && ! selectable.endsWith("LeafOnly"))) {
+ || (selectable != null && !selectable.endsWith("LeafOnly"))) {
boolean selected = treeState.isSelected(node);
writer.writeText(Boolean.toString(selected), null);
if (LOG.isDebugEnabled()) {
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -42,7 +44,6 @@
public class TreeRenderer extends RendererBase {
-// ///////////////////////////////////////////// constant
private static final Log LOG = LogFactory.getLog(TreeRenderer.class);
@@ -64,11 +65,6 @@
"Rplus.gif",
};
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
public void decode(FacesContext facesContext, UIComponent component) {
if (ComponentUtil.isOutputOnly(component)) {
@@ -178,7 +174,7 @@
final String[] scripts = {"script/tree.js"};
ComponentUtil.findPage(tree).getScriptFiles().add(scripts[0]);
- if (! TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
+ if (!TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
HtmlRendererUtil.startJavascript(writer);
writer.writeText(script, null);
HtmlRendererUtil.endJavascript(writer);
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -32,16 +34,8 @@
public class VerbatimRenderer extends RendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(VerbatimRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public void encodeEndTobago(FacesContext facesContext,
UIComponent component) throws IOException {
@@ -56,13 +50,8 @@
if (ComponentUtil.getBooleanAttribute(component, ATTR_ESCAPE)) {
writer.writeText(value, null);
- }
- else {
+ } else {
writer.write(value);
}
-
}
-
-// ///////////////////////////////////////////// bean getter + setter
-
}
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/context/SpeysideTheme.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/context/SpeysideTheme.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/context/SpeysideTheme.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/context/SpeysideTheme.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.context;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 11.02.2005 08:50:13.
* $Id$
*/
-package org.apache.myfaces.tobago.context;
public class SpeysideTheme extends Theme {
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.speyside.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
*
- * Licensed 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
+ * Licensed 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
+ * 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.
+ * 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* : $
*/
-package org.apache.myfaces.tobago.renderkit.html.speyside.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,16 +46,8 @@
public class BoxRenderer extends BoxRendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(BoxRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public int getFixedHeight(FacesContext facesContext, UIComponent component) {
return super.getFixedHeight(facesContext, component);
}
@@ -75,6 +69,7 @@
style =
HtmlRendererUtil.replaceStyleAttribute(style, "height", height + "px");
} catch (Exception e) {
+ // TODO
}
writer.startElement("div", component);
@@ -126,7 +121,8 @@
writer.endElement("div");
}
- protected void renderToolbar(FacesContext facesContext, TobagoResponseWriter writer, UIPanel toolbar) throws IOException {
+ protected void renderToolbar(FacesContext facesContext,
+ TobagoResponseWriter writer, UIPanel toolbar) throws IOException {
final Map attributes = toolbar.getAttributes();
String className = "tobago-box-header-toolbar-div";
if (ToolBarTag.LABEL_OFF.equals(attributes.get(ATTR_LABEL_POSITION))) {
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.html.speyside.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.tobago.renderkit.html.speyside.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -102,7 +103,7 @@
}
writer.endElement("td");
writer.endElement("tr");
- if (client.getTheme().getName() == "sap") { // FIXME: "sap"
+ if ("sap".equals(client.getTheme().getName())) { // FIXME: "sap"
writer.startElement("tr", null);
if (label != null) {
writer.startElement("td", null);
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.html.speyside.standard.tag;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
- *
- * Licensed 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.
+ *
+ * Licensed 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.
*/
+
/*
* Created 07.02.2003 16:00:00.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.html.speyside.standard.tag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -35,7 +37,8 @@
private static final Log LOG = LogFactory.getLog(TabGroupRenderer.class);
- protected void encodeContent(TobagoResponseWriter writer, FacesContext facesContext, UIPanel activeTab) throws IOException {
+ protected void encodeContent(TobagoResponseWriter writer,
+ FacesContext facesContext, UIPanel activeTab) throws IOException {
String bodyStyle = (String)
activeTab.getParent().getAttributes().get(ATTR_STYLE_BODY);