FAQ
Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/context/StandardTheme.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/context/StandardTheme.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/context/StandardTheme.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/context/StandardTheme.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 StandardTheme extends Theme {


Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;


Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ButtonRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ButtonRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ButtonRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

/**
* Created: Dec 1, 2004 8:04:26 PM

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.
*/
-package org.apache.myfaces.tobago.renderkit.fo.standard.standard.tag;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoUtils.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.
*/
-package org.apache.myfaces.tobago.renderkit.fo.standard.standard.tag;

import javax.faces.component.UIComponent;
import javax.faces.context.ResponseWriter;
@@ -25,7 +26,7 @@
* $Id$
*/
public class FoUtils {
- public static int DEFAULT_HEIGHT = 200;
+ public static final int DEFAULT_HEIGHT = 200;

public static void endBlockContainer(ResponseWriter writer) throws IOException {
writer.endElement("fo:block-container");
@@ -41,7 +42,8 @@
writer.writeAttribute("border-width", Layout.getMM(borderWidth), null);
}

- public static void layoutBlockContainer(ResponseWriter writer, int height, int width, int x, int y) throws IOException {
+ public static void layoutBlockContainer(ResponseWriter writer,
+ int height, int width, int x, int y) throws IOException {
writer.writeAttribute("top", Layout.getMM(y), null);
writer.writeAttribute("left", Layout.getMM(x), null);
writer.writeAttribute("height", Layout.getMM(height), null);
@@ -50,18 +52,21 @@
}


- public static void writeTextBlockAlignStart(ResponseWriter writer, UIComponent component, String text) throws IOException {
+ public static void writeTextBlockAlignStart(ResponseWriter writer,
+ UIComponent component, String text) throws IOException {
writeStartTextBlock(writer, component);
writer.writeAttribute("text-align", "start", null);
writeEndTextBlock(writer, text);
}
- public static void writeTextBlockAlignLeft(ResponseWriter writer, UIComponent component, String text) throws IOException {
+ public static void writeTextBlockAlignLeft(ResponseWriter writer,
+ UIComponent component, String text) throws IOException {
writeStartTextBlock(writer, component);
writer.writeAttribute("text-align", "left", null);
writeEndTextBlock(writer, text);
}

- private static void writeStartTextBlock(ResponseWriter writer, UIComponent component) throws IOException {
+ private static void writeStartTextBlock(ResponseWriter writer,
+ UIComponent component) throws IOException {
writer.startElement("fo:block", component);
writer.writeAttribute("line-height", "14pt", null);
writer.writeAttribute("font-family", "sans-serif", null);
@@ -69,7 +74,8 @@


}
- private static void writeEndTextBlock(ResponseWriter writer, String text) throws IOException {
+ private static void writeEndTextBlock(ResponseWriter writer,
+ String text) throws IOException {
writer.writeText(text, null);
writer.endElement("fo:block");
}

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/GridLayoutRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -90,7 +91,8 @@
private void layoutEnd(FacesContext facesContext, UIComponent component) {
Layout layout = Layout.getLayout(component.getParent());
if (layout == null) {
- throw new IllegalStateException("no Layout from "+component.getParent()+" "+component.getParent().getClientId(facesContext));
+ throw new IllegalStateException("no Layout from " + component.getParent() + " "
+ + component.getParent().getClientId(facesContext));
}
layout.setOrientation(Layout.TOP_ORIENTATION);
if (component.getAttributes().get("columns")!=null) {
@@ -105,10 +107,10 @@
//}
List children = component.getParent().getChildren();
ResponseWriter writer = facesContext.getResponseWriter();
- LOG.error("parent ist " +
- component.getParent() + "|"+ component.getParent().getClientId(facesContext)+
- " component ist " + component + "|"+component.getClientId(facesContext));
- if (children.size()>0) {
+ LOG.error("parent is " + component.getParent() + "|"
+ + component.getParent().getClientId(facesContext) + " component is "
+ + component + "|"+component.getClientId(facesContext));
+ if (children.size() > 0) {
int incrementX = layout.getWidth()/children.size();
int incrementY = layout.getHeight()/children.size();
int height = layout.getHeight();
@@ -116,15 +118,15 @@
int x = layout.getX();
int y = layout.getY();

- for (int i = 0; i<children.size();i++) {
+ for (int i = 0; i < children.size(); i++) {
LOG.error("i = " + i + " size = " + children.size());

UIComponent cell = (UIComponent) children.get(i);
//LOG.error(cell+ " | "+cell.getClientId(facesContext));
- if (! (cell instanceof UIMessages||cell instanceof UIGridLayout)) {
+ if (!(cell instanceof UIMessages || cell instanceof UIGridLayout)) {
try {
FoUtils.startBlockContainer(writer, component);
- if (layout.getOrientation()==Layout.TOP_ORIENTATION) {
+ if (layout.getOrientation() == Layout.TOP_ORIENTATION) {

FoUtils.layoutBlockContainer(writer, incrementY,
width, x, y+incrementY*i);

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ImageRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ImageRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/ImageRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

/**
* Created: Dec 1, 2004 8:02:07 PM

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,12 +34,9 @@
* $Id$
*/
public class InRenderer extends InputRendererBase {
-// ------------------------------------------------------------------ constants

private static final Log LOG = LogFactory.getLog(InRenderer.class);

-// ----------------------------------------------------------- business methods
-
public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
if (LOG.isDebugEnabled()) {
@@ -71,7 +69,9 @@

if (label != null) {
if (!Layout.isInLayout(component)) {
- FoUtils.startBlockContainer(writer, component); FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT,layout.getWidth()/2, layout.getX(), layout.getY() );
+ FoUtils.startBlockContainer(writer, component);
+ FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT,
+ layout.getWidth()/2, layout.getX(), layout.getY());
}
RenderUtil.encode(facesContext, label);
if (!Layout.isInLayout(component)) {
@@ -85,7 +85,9 @@
text = "";
}
if (!Layout.isInLayout(component)) {
- FoUtils.startBlockContainer(writer, component); FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT, layout.getWidth()/2, layout.getX()+layout.getWidth()/2, layout.getY());
+ FoUtils.startBlockContainer(writer, component);
+ FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT,
+ layout.getWidth()/2, layout.getX()+layout.getWidth()/2, layout.getY());
}
FoUtils.writeTextBlockAlignLeft(writer, component, "TextBox");
if (!Layout.isInLayout(component)) {

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/Layout.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import javax.faces.component.UIComponent;
import java.text.DecimalFormat;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LinkRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LinkRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LinkRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

/**
* Created: Dec 1, 2004 7:55:18 PM

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.RendererBase;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,17 +35,16 @@

private static final Log LOG = LogFactory.getLog(PageRenderer.class);

- private static String HEADER = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
- private static String FO_ROOT = "fo:root";
- private static String FO_XMLNS = "xmlns:fo";
- private static String FO_LAYOUT = "fo:layout-master-set";
- private static String FO_URL = "http://www.w3.org/1999/XSL/Format";
- private static String PAGE_MASTER = "fo:simple-page-master";
- private static String MASTER_NAME = "master-name";
+ private static final String HEADER = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+ private static final String FO_ROOT = "fo:root";
+ private static final String FO_XMLNS = "xmlns:fo";
+ private static final String FO_LAYOUT = "fo:layout-master-set";
+ private static final String FO_URL = "http://www.w3.org/1999/XSL/Format";
+ private static final String PAGE_MASTER = "fo:simple-page-master";
+ private static final String MASTER_NAME = "master-name";

public void encodeChildren(FacesContext facesContext, UIComponent component)
throws IOException {
- System.err.println("EncodeChildren") ;
LOG.error("Encode Children");
super.encodeChildren(facesContext, component);
}
@@ -57,9 +57,8 @@
UIPage page = (UIPage) component;
Layout layout = new Layout(2100, 2970);
int margin = 60;
- Layout in = layout.createWithMargin( margin*2, margin*2, margin, margin);
+ Layout in = layout.createWithMargin(margin*2, margin*2, margin, margin);
in.setParent(layout);
-


ResponseWriter writer = facesContext.getResponseWriter();

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

//import static org.apache.myfaces.tobago.TobagoConstants.ATTR_BODY_CONTENT;
import javax.faces.component.UIComponent;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit.fo.standard.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.fo.standard.standard.tag;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -69,7 +70,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
if (!Layout.isInLayout(component)) {
FoUtils.startBlockContainer(writer, component);
- FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT,layout.getWidth(), layout.getX(), layout.getY() );
+ FoUtils.layoutBlockContainer(writer, FoUtils.DEFAULT_HEIGHT, layout.getWidth(), layout.getX(), layout.getY());
}
FoUtils.writeTextBlockAlignLeft(writer, component, "TextArea");
if (!Layout.isInLayout(component)) {

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.wml.standard.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.wml.standard.standard.tag;

import org.apache.myfaces.tobago.renderkit.BoxRendererBase;


Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.wml.standard.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.wml.standard.standard.tag;

import org.apache.commons.collections.KeyValue;
import org.apache.commons.collections.keyvalue.DefaultKeyValue;
@@ -78,8 +80,8 @@
writer.endElement("go");
writer.endElement("anchor");
} else {
- LOG.error("button type \"" +
- type + "\" is not supported!");
+ LOG.error("button type \""
+ + type + "\" is not supported!");
}
}
}

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.wml.standard.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.wml.standard.standard.tag;

import org.apache.commons.collections.keyvalue.DefaultKeyValue;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_PASSWORD;
@@ -33,10 +35,6 @@
import java.io.IOException;

public class InRenderer extends RendererBase {
-// ----------------------------------------------------------------- interfaces
-
-
-// ---------------------------- interface TobagoRenderer

public void encodeEndTobago(FacesContext facesContext, UIComponent component)
throws IOException {

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.wml.standard.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.wml.standard.standard.tag;

import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
@@ -33,9 +35,9 @@
public class PageRenderer extends PageRendererBase {

private static final String DOCTYPE =
- "<?xml version='1.0'?>\n" +
- "<!DOCTYPE wml PUBLIC '-//WAPFORUM//DTD WML 1.1//EN'\n" +
- " 'http://www.wapforum.org/DTD/wml_1.1.xml'>";
+ "<?xml version='1.0'?>\n"
+ + "<!DOCTYPE wml PUBLIC '-//WAPFORUM//DTD WML 1.1//EN'\n"
+ + " 'http://www.wapforum.org/DTD/wml_1.1.xml'>";

public void encodeEndTobago(FacesContext facesContext, UIComponent component)
throws IOException {

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PanelRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PanelRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PanelRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.wml.standard.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 28.04.2003 at 15:29:36.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.wml.standard.standard.tag;

import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.renderkit.RenderUtil;
@@ -37,8 +39,8 @@
public void encodeChildrenTobago(FacesContext facesContext,
UIComponent uiComponent) throws IOException {

- UIPanel component = (UIPanel) uiComponent ;
- for (Iterator i = component.getChildren().iterator(); i.hasNext(); ) {
+ UIPanel component = (UIPanel) uiComponent;
+ for (Iterator i = component.getChildren().iterator(); i.hasNext();) {
UIComponent child = (UIComponent) i.next();
RenderUtil.encode(facesContext, child);
}

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.wml.standard.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.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit.wml.standard.standard.tag;

import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import static org.apache.myfaces.tobago.TobagoConstants.FACET_LABEL;

Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java (original)
+++ incubator/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.renderkit.wml.standard.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.wml.standard.standard.tag;

import org.apache.commons.collections.keyvalue.DefaultKeyValue;
import static org.apache.myfaces.tobago.TobagoConstants.FACET_LABEL;

Modified: incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java (original)
+++ incubator/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java Sat Feb 4 13:47:46 2006
@@ -15,11 +15,20 @@
*/
package org.apache.myfaces.tobago.apt.annotation;

+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
/**
* Created: Aug 5, 2005 3:11:18 PM
* User: bommel
* $Id: $
*/
+
+@Retention(value = RetentionPolicy.SOURCE)
+@Target(value = ElementType.TYPE)
+
public @interface UIComponentTag {

String UIComponent();

Search Discussions

  • Bommel at Feb 4, 2006 at 9:54 pm
    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Planet.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Planet.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Planet.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Planet.java Sat Feb 4 13:47:46 2006
    @@ -1,31 +1,31 @@
    +package org.apache.myfaces.tobago.example.demo.model.solar;
    +
    /*
    * 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 20.09.2002 at 10:54:32.
    * $Id: Planet.java 889 2004-05-26 14:52:59 +0200 (Mi, 26 Mai 2004) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.model.solar;

    import java.util.ArrayList;
    import java.util.List;

    public class Planet {

    -// ///////////////////////////////////////////// constant
    -
    public static final Planet MERCURY
    = new Planet("NN", "NN", "NN", "NN", new ArrayList());
    public static final Planet VENUS
    @@ -35,15 +35,11 @@
    public static final Planet MARS
    = new Planet("6794", "6.421e26", "227940000", "686.98", SolarObject.getSatellites("Mars"));

    -// ///////////////////////////////////////////// attribute
    -
    - String diameter;
    - String mass;
    - String sunDistance;
    - String timeOfCirculation;
    - List moons;
    -
    -// ///////////////////////////////////////////// constructor
    + private String diameter;
    + private String mass;
    + private String sunDistance;
    + private String timeOfCirculation;
    + private List moons;

    public Planet(Planet planet) {
    this.diameter = planet.diameter;
    @@ -61,9 +57,6 @@
    this.timeOfCirculation = timeOfCirculation;
    this.moons = moons;
    }
    -// ///////////////////////////////////////////// code
    -
    -// ///////////////////////////////////////////// bean getter + setter

    public String getDiameter() {
    return diameter;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Solar.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Solar.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Solar.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Solar.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.model.solar;
    +
    /*
    * 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 20.09.2002 at 10:40:44.
    * $Id: Solar.java 1271 2005-08-08 20:44:11 +0200 (Mo, 08 Aug 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.model.solar;

    import java.util.ArrayList;
    import java.util.List;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/SolarObject.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/SolarObject.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/SolarObject.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/SolarObject.java Sat Feb 4 13:47:46 2006
    @@ -1,24 +1,26 @@
    +package org.apache.myfaces.tobago.example.demo.model.solar;
    +
    /*
    * 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.
    */
    +
    /**
    * User: weber
    * Date: Nov 5, 2002
    * Time: 7:15:14 PM
    */
    -package org.apache.myfaces.tobago.example.demo.model.solar;

    import java.util.ArrayList;
    import java.util.List;
    @@ -167,9 +169,9 @@
    }

    public static SolarObject[] getArray() {
    - SolarObject[] array = new SolarObject[strings.length];
    + SolarObject[] array = new SolarObject[STRINGS.length];
    for (int i = 0; i < array.length; i++) {
    - array[i] = new SolarObject(strings[i]);
    + array[i] = new SolarObject(STRINGS[i]);
    }
    return array;
    }
    @@ -185,96 +187,96 @@
    return collect;
    }

    - private static final String[][] strings =
    + private static final String[][] STRINGS =
    {
    - {"Sun", "-", "-", "0", "0", "0", "0", "-", "0"},
    - {"Mercury", "I", "Sun", "57910", "87.97", "7.00", "0.21", "-", "-"},
    - {"Venus", "II", "Sun", "108200", "224.70", "3.39", "0.01", "-", "-"},
    - {"Earth", "III", "Sun", "149600", "365.26", "0.00", "0.02", "-", "-"},
    - {"Mars", "IV", "Sun", "227940", "686.98", "1.85", "0.09", "-", "-"},
    - {"Jupiter", "V", "Sun", "778330", "4332.71", "1.31", "0.05", "-", "-"},
    - {"Saturn", "VI", "Sun", "1429400", "10759.50", "2.49", "0.06", "-", "-"},
    - {"Uranus", "VII", "Sun", "2870990", "30685.00", "0.77", "0.05", "Herschel", "1781"},
    - {"Neptune", "VIII", "Sun", "4504300", "60190.00", "1.77", "0.01", "Adams", "1846"},
    - {"Pluto", "IX", "Sun", "5913520", "90800", "17.15", "0.25", "Tombaugh", "1930"},
    - {"Moon", "I", "Earth", "384", "27.32", "5.14", "0.05", "-", "-"},
    - {"Phobos", "I", "Mars", "9", "0.32", "1.00", "0.02", "Hall", "1877"},
    - {"Deimos", "II", "Mars", "23", "1.26", "1.80", "0.00", "Hall", "1877"},
    - {"Metis", "XVI", "Jupiter", "128", "0.29", "0.00", "0.00", "Synnott", "1979"},
    - {"Adrastea", "XV", "Jupiter", "129", "0.30", "0.00", "0.00", "Jewitt", "1979"},
    - {"Amalthea", "V", "Jupiter", "181", "0.50", "0.40", "0.00", "Barnard", "1892"},
    - {"Thebe", "XIV", "Jupiter", "222", "0.67", "0.80", "0.02", "Synnott", "1979"},
    - {"Io", "I", "Jupiter", "422", "1.77", "0.04", "0.00", "Galileo", "1610"},
    - {"Europa", "II", "Jupiter", "671", "3.55", "0.47", "0.01", "Galileo", "1610"},
    - {"Ganymede", "III", "Jupiter", "1070", "7.15", "0.19", "0.00", "Galileo", "1610"},
    - {"Callisto", "IV", "Jupiter", "1883", "16.69", "0.28", "0.01", "Galileo", "1610"},
    - {"Themisto", "XVIII","Jupiter", "7507", "0", "", "", "Sheppard", "2000"},
    - {"Leda", "XIII", "Jupiter", "11094", "238.72", "27.00", "0.15", "Kowal", "1974"},
    - {"Himalia", "VI", "Jupiter", "11480", "250.57", "28.00", "0.16", "Perrine", "1904"},
    - {"Lysithea", "X", "Jupiter", "11720", "259.22", "29.00", "0.11", "Nicholson", "1938"},
    - {"Elara", "VII", "Jupiter", "11737", "259.65", "28.00", "0.21", "Perrine", "1905"},
    - {"Ananke", "XII", "Jupiter", "21200", "-631", "147.00", "0.17", "Nicholson", "1951"},
    - {"Carme", "XI", "Jupiter", "22600", "-692", "163.00", "0.21", "Nicholson", "1938"},
    - {"Pasiphae", "VIII", "Jupiter", "23500", "-735", "147.00", "0.38", "Melotte", "1908"},
    - {"Sinope", "IX", "Jupiter", "23700", "-758", "153.00", "0.28", "Nicholson", "1914"},
    - {"Iocaste", "XXIV", "Jupiter", "20216","0", "", "", "Sheppard", "2000"},
    - {"Harpalyke", "XXII", "Jupiter", "21132","0", "", "", "Sheppard", "2000"},
    - {"Praxidike", "XXVII","Jupiter", "20964","0", "", "", "Sheppard", "2000"},
    - {"Taygete", "XX", "Jupiter", "23312","0", "", "", "Sheppard", "2000"},
    - {"Chaldene", "XXI", "Jupiter", "23387","0", "", "", "Sheppard", "2000"},
    - {"Kalyke", "XXIII","Jupiter", "23745","0", "", "", "Sheppard", "2000"},
    - {"Callirrhoe", "XVII", "Jupiter", "24100","0", "", "", "Sheppard", "2000"},
    - {"Megaclite", "XIX", "Jupiter", "23911","0", "", "", "Sheppard", "2000"},
    - {"Isonoe", "XXVI", "Jupiter", "23078","0", "", "", "Sheppard", "2000"},
    - {"Erinome", "XXV", "Jupiter", "23168","0", "", "", "Sheppard", "2000"},
    - {"Pan", "XVIII","Saturn", "134", "0.58", "0.00", "0.00", "Showalter", "1990"},
    - {"Atlas", "XV", "Saturn", "138", "0.60", "0.00", "0.00", "Terrile", "1980"},
    - {"Prometheus", "XVI", "Saturn", "139", "0.61", "0.00", "0.00", "Collins", "1980"},
    - {"Pandora", "XVII", "Saturn", "142", "0.63", "0.00", "0.00", "Collins", "1980"},
    - {"Epimetheus", "XI", "Saturn", "151", "0.69", "0.34", "0.01", "Walker", "1980"},
    - {"Janus", "X", "Saturn", "151", "0.69", "0.14", "0.01", "Dollfus", "1966"},
    - {"Mimas", "I", "Saturn", "186", "0.94", "1.53", "0.02", "Herschel", "1789"},
    - {"Enceladus", "II", "Saturn", "238", "1.37", "0.02", "0.00", "Herschel", "1789"},
    - {"Tethys", "III", "Saturn", "295", "1.89", "1.09", "0.00", "Cassini", "1684"},
    - {"Telesto", "XIII", "Saturn", "295", "1.89", "0.00", "0.00", "Smith", "1980"},
    - {"Calypso", "XIV", "Saturn", "295", "1.89", "0.00", "0.00", "Pascu", "1980"},
    - {"Dione", "IV", "Saturn", "377", "2.74", "0.02", "0.00", "Cassini", "1684"},
    - {"Helene", "XII", "Saturn", "377", "2.74", "0.20", "0.01", "Laques", "1980"},
    - {"Rhea", "V", "Saturn", "527", "4.52", "0.35", "0.00", "Cassini", "1672"},
    - {"Titan", "VI", "Saturn", "1222", "15.95", "0.33", "0.03", "Huygens", "1655"},
    - {"Hyperion", "VII", "Saturn", "1481", "21.28", "0.43", "0.10", "Bond", "1848"},
    - {"Iapetus", "VIII", "Saturn", "3561", "79.33", "14.72", "0.03", "Cassini", "1671"},
    - {"Phoebe", "IX", "Saturn", "12952", "-550.48", "175.30", "0.16", "Pickering", "1898"},
    - {"Cordelia", "VI", "Uranus", "50", "0.34", "0.14", "0.00", "Voyager 2", "1986"},
    - {"Ophelia", "VII", "Uranus", "54", "0.38", "0.09", "0.00", "Voyager 2", "1986"},
    - {"Bianca", "VIII", "Uranus", "59", "0.43", "0.16", "0.00", "Voyager 2", "1986"},
    - {"Cressida", "IX", "Uranus", "62", "0.46", "0.04", "0.00", "Voyager 2", "1986"},
    - {"Desdemona", "X", "Uranus", "63", "0.47", "0.16", "0.00", "Voyager 2", "1986"},
    - {"Juliet", "XI", "Uranus", "64", "0.49", "0.06", "0.00", "Voyager 2", "1986"},
    - {"Portia", "XII", "Uranus", "66", "0.51", "0.09", "0.00", "Voyager 2", "1986"},
    - {"Rosalind", "XIII", "Uranus", "70", "0.56", "0.28", "0.00", "Voyager 2", "1986"},
    - {"Belinda", "XIV", "Uranus", "75", "0.62", "0.03", "0.00", "Voyager 2", "1986"},
    - {"1986U10", "", "Uranus", "76", "0.64", "", "", "Karkoschka", "1999"},
    - {"Puck", "XV", "Uranus", "86", "0.76", "0.31", "0.00", "Voyager 2", "1985"},
    - {"Miranda", "V", "Uranus", "130", "1.41", "4.22", "0.00", "Kuiper", "1948"},
    - {"Ariel", "I", "Uranus", "191", "2.52", "0.00", "0.00", "Lassell", "1851"},
    - {"Umbriel", "II", "Uranus", "266", "4.14", "0.00", "0.00", "Lassell", "1851"},
    - {"Titania", "III", "Uranus", "436", "8.71", "0.00", "0.00", "Herschel", "1787"},
    - {"Oberon", "IV", "Uranus", "583", "13.46", "0.00", "0.00", "Herschel", "1787"},
    - {"Caliban", "XVI", "Uranus", "7169", "-580", "140.", "0.08", "Gladman", "1997"},
    - {"Stephano", "XX", "Uranus", "7948", "-674", "143.", "0.24", "Gladman", "1999"},
    - {"Sycorax", "XVII", "Uranus", "12213", "-1289", "153.", "0.51", "Nicholson", "1997"},
    - {"Prospero", "XVIII","Uranus", "16568", "-2019", "152.", "0.44", "Holman", "1999"},
    - {"Setebos", "XIX", "Uranus", "17681", "-2239", "158.", "0.57", "Kavelaars", "1999"},
    - {"Naiad", "III", "Neptune", "48", "0.29", "0.00", "0.00", "Voyager 2", "1989"},
    - {"Thalassa", "IV", "Neptune", "50", "0.31", "4.50", "0.00", "Voyager 2", "1989"},
    - {"Despina", "V", "Neptune", "53", "0.33", "0.00", "0.00", "Voyager 2", "1989"},
    - {"Galatea", "VI", "Neptune", "62", "0.43", "0.00", "0.00", "Voyager 2", "1989"},
    - {"Larissa", "VII", "Neptune", "74", "0.55", "0.00", "0.00", "Reitsema", "1989"},
    - {"Proteus", "VIII", "Neptune", "118", "1.12", "0.00", "0.00", "Voyager 2", "1989"},
    - {"Triton", "I", "Neptune", "355", "-5.88", "157.00", "0.00", "Lassell", "1846"},
    - {"Nereid", "II", "Neptune", "5513", "360.13", "29.00", "0.75", "Kuiper", "1949"},
    - {"Charon", "I", "Pluto", "20", "6.39", "98.80", "0.00", "Christy", "1978"}
    + {"Sun", "-", "-", "0", "0", "0", "0", "-", "0"},
    + {"Mercury", "I", "Sun", "57910", "87.97", "7.00", "0.21", "-", "-"},
    + {"Venus", "II", "Sun", "108200", "224.70", "3.39", "0.01", "-", "-"},
    + {"Earth", "III", "Sun", "149600", "365.26", "0.00", "0.02", "-", "-"},
    + {"Mars", "IV", "Sun", "227940", "686.98", "1.85", "0.09", "-", "-"},
    + {"Jupiter", "V", "Sun", "778330", "4332.71", "1.31", "0.05", "-", "-"},
    + {"Saturn", "VI", "Sun", "1429400", "10759.50", "2.49", "0.06", "-", "-"},
    + {"Uranus", "VII", "Sun", "2870990", "30685.00", "0.77", "0.05", "Herschel", "1781"},
    + {"Neptune", "VIII", "Sun", "4504300", "60190.00", "1.77", "0.01", "Adams", "1846"},
    + {"Pluto", "IX", "Sun", "5913520", "90800", "17.15", "0.25", "Tombaugh", "1930"},
    + {"Moon", "I", "Earth", "384", "27.32", "5.14", "0.05", "-", "-"},
    + {"Phobos", "I", "Mars", "9", "0.32", "1.00", "0.02", "Hall", "1877"},
    + {"Deimos", "II", "Mars", "23", "1.26", "1.80", "0.00", "Hall", "1877"},
    + {"Metis", "XVI", "Jupiter", "128", "0.29", "0.00", "0.00", "Synnott", "1979"},
    + {"Adrastea", "XV", "Jupiter", "129", "0.30", "0.00", "0.00", "Jewitt", "1979"},
    + {"Amalthea", "V", "Jupiter", "181", "0.50", "0.40", "0.00", "Barnard", "1892"},
    + {"Thebe", "XIV", "Jupiter", "222", "0.67", "0.80", "0.02", "Synnott", "1979"},
    + {"Io", "I", "Jupiter", "422", "1.77", "0.04", "0.00", "Galileo", "1610"},
    + {"Europa", "II", "Jupiter", "671", "3.55", "0.47", "0.01", "Galileo", "1610"},
    + {"Ganymede", "III", "Jupiter", "1070", "7.15", "0.19", "0.00", "Galileo", "1610"},
    + {"Callisto", "IV", "Jupiter", "1883", "16.69", "0.28", "0.01", "Galileo", "1610"},
    + {"Themisto", "XVIII", "Jupiter", "7507", "0", "", "", "Sheppard", "2000"},
    + {"Leda", "XIII", "Jupiter", "11094", "238.72", "27.00", "0.15", "Kowal", "1974"},
    + {"Himalia", "VI", "Jupiter", "11480", "250.57", "28.00", "0.16", "Perrine", "1904"},
    + {"Lysithea", "X", "Jupiter", "11720", "259.22", "29.00", "0.11", "Nicholson", "1938"},
    + {"Elara", "VII", "Jupiter", "11737", "259.65", "28.00", "0.21", "Perrine", "1905"},
    + {"Ananke", "XII", "Jupiter", "21200", "-631", "147.00", "0.17", "Nicholson", "1951"},
    + {"Carme", "XI", "Jupiter", "22600", "-692", "163.00", "0.21", "Nicholson", "1938"},
    + {"Pasiphae", "VIII", "Jupiter", "23500", "-735", "147.00", "0.38", "Melotte", "1908"},
    + {"Sinope", "IX", "Jupiter", "23700", "-758", "153.00", "0.28", "Nicholson", "1914"},
    + {"Iocaste", "XXIV", "Jupiter", "20216", "0", "", "", "Sheppard", "2000"},
    + {"Harpalyke", "XXII", "Jupiter", "21132", "0", "", "", "Sheppard", "2000"},
    + {"Praxidike", "XXVII", "Jupiter", "20964", "0", "", "", "Sheppard", "2000"},
    + {"Taygete", "XX", "Jupiter", "23312", "0", "", "", "Sheppard", "2000"},
    + {"Chaldene", "XXI", "Jupiter", "23387", "0", "", "", "Sheppard", "2000"},
    + {"Kalyke", "XXIII", "Jupiter", "23745", "0", "", "", "Sheppard", "2000"},
    + {"Callirrhoe", "XVII", "Jupiter", "24100", "0", "", "", "Sheppard", "2000"},
    + {"Megaclite", "XIX", "Jupiter", "23911", "0", "", "", "Sheppard", "2000"},
    + {"Isonoe", "XXVI", "Jupiter", "23078", "0", "", "", "Sheppard", "2000"},
    + {"Erinome", "XXV", "Jupiter", "23168", "0", "", "", "Sheppard", "2000"},
    + {"Pan", "XVIII", "Saturn", "134", "0.58", "0.00", "0.00", "Showalter", "1990"},
    + {"Atlas", "XV", "Saturn", "138", "0.60", "0.00", "0.00", "Terrile", "1980"},
    + {"Prometheus", "XVI", "Saturn", "139", "0.61", "0.00", "0.00", "Collins", "1980"},
    + {"Pandora", "XVII", "Saturn", "142", "0.63", "0.00", "0.00", "Collins", "1980"},
    + {"Epimetheus", "XI", "Saturn", "151", "0.69", "0.34", "0.01", "Walker", "1980"},
    + {"Janus", "X", "Saturn", "151", "0.69", "0.14", "0.01", "Dollfus", "1966"},
    + {"Mimas", "I", "Saturn", "186", "0.94", "1.53", "0.02", "Herschel", "1789"},
    + {"Enceladus", "II", "Saturn", "238", "1.37", "0.02", "0.00", "Herschel", "1789"},
    + {"Tethys", "III", "Saturn", "295", "1.89", "1.09", "0.00", "Cassini", "1684"},
    + {"Telesto", "XIII", "Saturn", "295", "1.89", "0.00", "0.00", "Smith", "1980"},
    + {"Calypso", "XIV", "Saturn", "295", "1.89", "0.00", "0.00", "Pascu", "1980"},
    + {"Dione", "IV", "Saturn", "377", "2.74", "0.02", "0.00", "Cassini", "1684"},
    + {"Helene", "XII", "Saturn", "377", "2.74", "0.20", "0.01", "Laques", "1980"},
    + {"Rhea", "V", "Saturn", "527", "4.52", "0.35", "0.00", "Cassini", "1672"},
    + {"Titan", "VI", "Saturn", "1222", "15.95", "0.33", "0.03", "Huygens", "1655"},
    + {"Hyperion", "VII", "Saturn", "1481", "21.28", "0.43", "0.10", "Bond", "1848"},
    + {"Iapetus", "VIII", "Saturn", "3561", "79.33", "14.72", "0.03", "Cassini", "1671"},
    + {"Phoebe", "IX", "Saturn", "12952", "-550.48", "175.30", "0.16", "Pickering", "1898"},
    + {"Cordelia", "VI", "Uranus", "50", "0.34", "0.14", "0.00", "Voyager 2", "1986"},
    + {"Ophelia", "VII", "Uranus", "54", "0.38", "0.09", "0.00", "Voyager 2", "1986"},
    + {"Bianca", "VIII", "Uranus", "59", "0.43", "0.16", "0.00", "Voyager 2", "1986"},
    + {"Cressida", "IX", "Uranus", "62", "0.46", "0.04", "0.00", "Voyager 2", "1986"},
    + {"Desdemona", "X", "Uranus", "63", "0.47", "0.16", "0.00", "Voyager 2", "1986"},
    + {"Juliet", "XI", "Uranus", "64", "0.49", "0.06", "0.00", "Voyager 2", "1986"},
    + {"Portia", "XII", "Uranus", "66", "0.51", "0.09", "0.00", "Voyager 2", "1986"},
    + {"Rosalind", "XIII", "Uranus", "70", "0.56", "0.28", "0.00", "Voyager 2", "1986"},
    + {"Belinda", "XIV", "Uranus", "75", "0.62", "0.03", "0.00", "Voyager 2", "1986"},
    + {"1986U10", "", "Uranus", "76", "0.64", "", "", "Karkoschka", "1999"},
    + {"Puck", "XV", "Uranus", "86", "0.76", "0.31", "0.00", "Voyager 2", "1985"},
    + {"Miranda", "V", "Uranus", "130", "1.41", "4.22", "0.00", "Kuiper", "1948"},
    + {"Ariel", "I", "Uranus", "191", "2.52", "0.00", "0.00", "Lassell", "1851"},
    + {"Umbriel", "II", "Uranus", "266", "4.14", "0.00", "0.00", "Lassell", "1851"},
    + {"Titania", "III", "Uranus", "436", "8.71", "0.00", "0.00", "Herschel", "1787"},
    + {"Oberon", "IV", "Uranus", "583", "13.46", "0.00", "0.00", "Herschel", "1787"},
    + {"Caliban", "XVI", "Uranus", "7169", "-580", "140.", "0.08", "Gladman", "1997"},
    + {"Stephano", "XX", "Uranus", "7948", "-674", "143.", "0.24", "Gladman", "1999"},
    + {"Sycorax", "XVII" , "Uranus", "12213", "-1289", "153.", "0.51", "Nicholson", "1997"},
    + {"Prospero", "XVIII", "Uranus", "16568", "-2019", "152.", "0.44", "Holman", "1999"},
    + {"Setebos", "XIX", "Uranus", "17681", "-2239", "158.", "0.57", "Kavelaars", "1999"},
    + {"Naiad", "III", "Neptune", "48", "0.29", "0.00", "0.00", "Voyager 2", "1989"},
    + {"Thalassa", "IV", "Neptune", "50", "0.31", "4.50", "0.00", "Voyager 2", "1989"},
    + {"Despina", "V", "Neptune", "53", "0.33", "0.00", "0.00", "Voyager 2", "1989"},
    + {"Galatea", "VI", "Neptune", "62", "0.43", "0.00", "0.00", "Voyager 2", "1989"},
    + {"Larissa", "VII", "Neptune", "74", "0.55", "0.00", "0.00", "Reitsema", "1989"},
    + {"Proteus", "VIII", "Neptune", "118", "1.12", "0.00", "0.00", "Voyager 2", "1989"},
    + {"Triton", "I", "Neptune", "355", "-5.88", "157.00", "0.00", "Lassell", "1846"},
    + {"Nereid", "II", "Neptune", "5513", "360.13", "29.00", "0.75", "Kuiper", "1949"},
    + {"Charon", "I", "Pluto", "20", "6.39", "98.80", "0.00", "Christy", "1978"}
    };

    }

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.overview;
    +
    /*
    * 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 19.05.2004 18:47:47.
    * $Id: OverviewController.java 1269 2005-08-08 20:20:19 +0200 (Mo, 08 Aug 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.overview;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -33,8 +35,6 @@

    public class OverviewController {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(OverviewController.class);

    private static final String[] ITEM_KEYS = {
    @@ -57,8 +57,6 @@
    "siblingLeafOnly"
    };

    -// ///////////////////////////////////////////// attribute
    -
    private String radioValue;

    private String singleValue;
    @@ -83,7 +81,6 @@

    private SheetConfig sheetConfig;

    -// ///////////////////////////////////////////// constructor

    public OverviewController() {
    radioValue = ITEM_KEYS[0];
    @@ -95,10 +92,6 @@
    sheetConfig = new SheetConfig();
    }

    -// ///////////////////////////////////////////// action
    -
    -// ///////////////////////////////////////////// util
    -
    private static SelectItem[] getSelectItems(
    String[] keys, ResourceManager resourceManager, String resource) {
    SelectItem[] items = new SelectItem[keys.length];
    @@ -106,7 +99,9 @@
    String label = resourceManager.getProperty(
    FacesContext.getCurrentInstance().getViewRoot(), resource, keys[i]);
    LOG.info("label = " + label + "");
    - if (label == null) {label = keys[i];}
    + if (label == null) {
    + label = keys[i];
    + }
    items[i] = new SelectItem(keys[i], label);
    }
    return items;
    @@ -117,11 +112,9 @@
    }

    public boolean getShowPopup() {
    - return "popupButton".equals(lastAction) || "popupButton2".equals(lastAction) ;
    + return "popupButton".equals(lastAction) || "popupButton2".equals(lastAction);
    }

    -// ///////////////////////////////////////////// getter + setter
    -
    public SelectItem[] getItems() {
    ResourceManager resourceManager = ResourceManagerFactory
    .getResourceManager(FacesContext.getCurrentInstance());
    @@ -149,8 +142,6 @@
    return getSelectItems(TREELISTBOX_SELECT_MODE_KEYS, resourceManager, "overview");

    }
    -
    -// ///////////////////////////////////////////// bean getter + setter

    public String getRadioValue() {
    return radioValue;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.overview;
    +
    /*
    * 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 04.06.2004 09:27:14.
    * $Id: PresentationController.java 1269 2005-08-08 20:20:19 +0200 (Mo, 08 Aug 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.overview;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -35,17 +37,12 @@
    import java.util.List;

    public class PresentationController {
    -// ------------------------------------------------------------------ constants

    private static final Log LOG = LogFactory.getLog(PresentationController.class);

    -// ----------------------------------------------------------------- attributes
    -
    - protected List pages;
    -
    - protected int pageIndex;
    + private List pages;

    -// ----------------------------------------------------------- business methods
    + private int pageIndex;

    public String gotoFirst() {
    pageIndex = 0;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.overview;
    +
    /*
    * 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 19.01.2005 21:49:41.
    * $Id: $
    */
    -package org.apache.myfaces.tobago.example.demo.overview;

    import javax.faces.model.SelectItem;

    @@ -58,7 +60,7 @@


    public String configSheet() {
    - sheetConfigPopup = ! sheetConfigPopup;
    + sheetConfigPopup = !sheetConfigPopup;
    return null;
    }


    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SynchronizeNavigationPhaseListener.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SynchronizeNavigationPhaseListener.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SynchronizeNavigationPhaseListener.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SynchronizeNavigationPhaseListener.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.overview;
    +
    /*
    * 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 02.06.2004 13:48:46.
    * $Id: SynchronizeNavigationPhaseListener.java 1226 2005-04-21 10:18:15 +0200 (Do, 21 Apr 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.overview;

    import javax.faces.context.FacesContext;
    import javax.faces.event.PhaseEvent;
    @@ -25,10 +27,6 @@
    import javax.faces.event.PhaseListener;

    public class SynchronizeNavigationPhaseListener implements PhaseListener {
    -
    -// ----------------------------------------------------------------- interfaces
    -
    -// ---------------------------- interface PhaseListener

    public void beforePhase(PhaseEvent event) {
    }

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java Sat Feb 4 13:47:46 2006
    @@ -1,26 +1,26 @@
    +package org.apache.myfaces.tobago.example.foreach;
    /*
    * 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.
    */
    -package org.apache.myfaces.tobago.example.foreach;

    import java.util.ArrayList;
    import java.util.List;

    public class BirdList {

    - List birds = null;
    + private List birds = null;

    public List getBirds() {
    if (birds == null) {

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishPond.java Sat Feb 4 13:47:46 2006
    @@ -1,5 +1,21 @@
    package org.apache.myfaces.tobago.example.nonfacesrequest;

    +/*
    + * 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.
    + */
    +
    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    @@ -9,7 +25,7 @@

    public class FishPond {

    - private Log LOG = LogFactory.getLog(FishPond.class);
    + private static final Log LOG = LogFactory.getLog(FishPond.class);

    private Map<String, String> fishes;


    Modified: incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/java/org/apache/myfaces/tobago/example/nonfacesrequest/FishServlet.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,23 @@
    +package org.apache.myfaces.tobago.example.nonfacesrequest;
    +
    /*
    * 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.
    */
    -package org.apache.myfaces.tobago.example.nonfacesrequest;

    import org.apache.myfaces.tobago.servlet.NonFacesRequestServlet;
    import org.apache.myfaces.tobago.util.VariableResolverUtil;
    -import org.apache.myfaces.tobago.example.nonfacesrequest.FishPond;
    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    @@ -25,7 +25,7 @@

    public class FishServlet extends NonFacesRequestServlet {

    - private Log LOG = LogFactory.getLog(FishServlet.class);
    + private static final Log LOG = LogFactory.getLog(FishServlet.class);

    public String invokeApplication(FacesContext facesContext) {


    Modified: incubator/tobago/trunk/tobago-theme/pom.xml
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/pom.xml?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-theme/pom.xml (original)
    +++ incubator/tobago/trunk/tobago-theme/pom.xml Sat Feb 4 13:47:46 2006
    @@ -3,17 +3,17 @@
    <!--
    * 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.
    -->

    <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    @@ -28,6 +28,24 @@
    <name>Tobago Theme</name>
    <groupId>org.apache.myfaces.tobago</groupId>
    <artifactId>tobago-theme</artifactId>
    + <reporting>
    + <plugins>
    + <plugin>
    + <groupId>org.codehaus.mojo</groupId>
    + <artifactId>jxr-maven-plugin</artifactId>
    + </plugin>
    +
    + <plugin>
    + <groupId>org.apache.maven.plugins</groupId>
    + <artifactId>maven-checkstyle-plugin</artifactId>
    + <configuration>
    + <configLocation>org/apache/myfaces/tobago/checkstyle.xml</configLocation>
    + <xrefLocation>xref</xrefLocation>
    + <excludes>**/package-info.java</excludes>
    + </configuration>
    + </plugin>
    + </plugins>
    + </reporting>
    <modules>
    <module>tobago-theme-standard</module>
    <module>tobago-theme-scarborough</module>

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/java/org/apache/myfaces/tobago/context/RichmondTheme.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/java/org/apache/myfaces/tobago/context/RichmondTheme.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/java/org/apache/myfaces/tobago/context/RichmondTheme.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/java/org/apache/myfaces/tobago/context/RichmondTheme.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,26 @@
    +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
    + * 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 11.02.2005 08:50:13.
    * $Id: RichmondTheme.java 1886 2005-11-01 21:03:54Z bommel $
    */
    -package org.apache.myfaces.tobago.context;
    +

    public class RichmondTheme extends Theme {


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/context/ScarboroughTheme.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/context/ScarboroughTheme.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/context/ScarboroughTheme.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/context/ScarboroughTheme.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 ScarboroughTheme extends Theme {


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.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/mozilla/tag/BoxRenderer.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/mozilla/tag/BoxRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.renderkit.html.scarborough.mozilla.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.
    * : $
    */
    -package org.apache.myfaces.tobago.renderkit.html.scarborough.mozilla.tag;

    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_BODY;
    import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
    @@ -38,8 +40,6 @@
    protected String getAttrStyleKey() {
    return ATTR_STYLE_BODY;
    }
    -
    -// ///////////////////////////////////////////// bean getter + setter

    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.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/mozilla_4_7/tag/BoxRenderer.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/mozilla_4_7/tag/BoxRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.renderkit.html.scarborough.mozilla_4_7.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.mozilla_4_7.tag;

    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.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/mozilla_4_7/tag/ProgressRenderer.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/mozilla_4_7/tag/ProgressRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.renderkit.html.scarborough.mozilla_4_7.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.
    * : $
    */
    -package org.apache.myfaces.tobago.renderkit.html.scarborough.mozilla_4_7.tag;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -33,16 +35,8 @@

    public class ProgressRenderer extends RendererBase {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(ProgressRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public void encodeEndTobago(FacesContext facesContext,
    UIComponent uiComponent) throws IOException {

    @@ -52,7 +46,7 @@

    if (model == null) {
    LOG.warn("'null' value found! Using dummy Model instead!");
    - model = new DefaultBoundedRangeModel(4,1,0,10);
    + model = new DefaultBoundedRangeModel(4, 1, 0, 10);
    }

    ResponseWriter writer = facesContext.getResponseWriter();

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.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/msie/tag/MessageRenderer.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/msie/tag/MessageRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.renderkit.html.scarborough.msie.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.msie.tag;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -36,26 +38,18 @@

    public class MessageRenderer extends MessageRendererBase {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(MessageRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public int getFixedHeight(FacesContext facesContext, UIComponent component) {
    if (LOG.isDebugEnabled()) {
    LOG.debug("component = '" + component + "'");
    }
    String clientId = null;
    if (component instanceof UIMessage) {
    - clientId = ((UIMessage)component).getFor();
    + clientId = ((UIMessage) component).getFor();
    }
    int count = 0;
    - for (Iterator i = facesContext.getMessages(clientId); i.hasNext(); ) {
    + for (Iterator i = facesContext.getMessages(clientId); i.hasNext();) {
    count++;
    }
    if (LOG.isDebugEnabled()) {
    @@ -112,7 +106,6 @@
    writer.endElement("img");
    }
    }
    -// ///////////////////////////////////////////// bean getter + setter

    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.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/opera/tag/BoxRenderer.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/opera/tag/BoxRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.renderkit.html.scarborough.opera.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.
    * : $
    */
    -package org.apache.myfaces.tobago.renderkit.html.scarborough.opera.tag;

    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
    @@ -35,14 +37,6 @@

    public class BoxRenderer extends org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.BoxRenderer {

    -// ///////////////////////////////////////////// constant
    -
    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public void encodeBeginTobago(FacesContext facesContext,
    UIComponent component) throws IOException {

    @@ -71,7 +65,7 @@
    }
    writer.endElement("b");
    writer.endElement("legend");
    - if (! ClientProperties.getInstance(facesContext.getViewRoot())
    + if (!ClientProperties.getInstance(facesContext.getViewRoot())
    .getUserAgent().equals(UserAgent.OPERA_7_11)) {
    writer.startElement("br", null);
    writer.endElement("br");
    @@ -85,8 +79,6 @@
    public int getPaddingWidth(FacesContext facesContext, UIComponent component) {
    return 4;
    }
    -
    -// ///////////////////////////////////////////// bean getter + setter

    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ActionRenderer.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/ActionRenderer.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/ActionRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ActionRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,40 +1,35 @@
    +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;

    public class ActionRenderer extends RendererBase {

    -// ///////////////////////////////////////////// constant
    -
    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor

    public ActionRenderer() {
    }

    -// ///////////////////////////////////////////// code
    -
    -// ///////////////////////////////////////////// bean getter + setter

    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.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/BoxRenderer.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/BoxRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,26 @@
    +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_ICON_SIZE;
    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.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/ButtonRenderer.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/ButtonRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.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;
    @@ -49,10 +51,6 @@

    private static final Log LOG = LogFactory.getLog(ButtonRenderer.class);

    -// ----------------------------------------------------------------- interfaces
    -
    -
    -// ---------------------------- interface TobagoRenderer

    public void encodeBeginTobago(FacesContext facesContext,
    UIComponent component) throws IOException {
    @@ -85,12 +83,12 @@
    }
    writer.writeAttribute("style", null, ATTR_STYLE);
    writer.writeComponentClass();
    - 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);
    }
    writer.writeText("", null); // force closing the start tag

    @@ -165,13 +163,12 @@
    } else if (COMMAND_TYPE_SCRIPT.equals(type)) {
    onclick = command;
    } else if (defaultCommand) {
    - onclick = "setAction('" +
    - ComponentUtil.findPage(component).getFormId(facesContext) +
    - "','" + clientId + "')";
    + onclick = "setAction('" + ComponentUtil.findPage(component).getFormId(facesContext)
    + + "','" + clientId + "')";
    } else {
    - onclick = "submitAction('" +
    - ComponentUtil.findPage(component).getFormId(facesContext) +
    - "','" + clientId + "')";
    + onclick = "submitAction('"
    + + ComponentUtil.findPage(component).getFormId(facesContext)
    + + "','" + clientId + "')";
    }
    return onclick;
    }

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.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/CalendarRenderer.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/CalendarRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.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.StringUtils;
    import org.apache.commons.logging.Log;
    @@ -44,15 +46,9 @@

    public class CalendarRenderer extends RendererBase {

    -// ///////////////////////////////////////////// constant

    private static final Log LOG = LogFactory.getLog(CalendarRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code

    public void encodeEndTobago(FacesContext facesContext,
    UIComponent component) throws IOException {
    @@ -63,8 +59,6 @@

    String id = output.getClientId(facesContext);

    -// String dateTextBoxId = (String) facesContext.getExternalContext()
    -// .getRequestParameterMap().get("tobago.date.inputId");
    String dateTextBoxId = (String) component.getAttributes().get(ATTR_CALENDAR_DATE_INPUT_ID);

    if (LOG.isDebugEnabled()) {
    @@ -112,7 +106,8 @@
    writer.startElement("img", null);
    writer.writeClassAttribute("tobago-calendar-header");
    writer.writeAttribute("alt", "", null);
    - writer.writeAttribute("src", ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarFastPrev.gif"), null);
    + writer.writeAttribute("src",
    + ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarFastPrev.gif"), null);
    writer.writeAttribute("onclick", "addMonth('" + id + "', -12)", null);
    writer.endElement("img");
    writer.endElement("td");
    @@ -149,7 +144,8 @@
    writer.startElement("img", null);
    writer.writeClassAttribute("tobago-calendar-header");
    writer.writeAttribute("alt", "", null);
    - writer.writeAttribute("src", ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarFastNext.gif"), null);
    + writer.writeAttribute("src",
    + ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarFastNext.gif"), null);
    writer.writeAttribute("onclick", "addMonth('" + id + "', 12)", null);
    writer.endElement("img");
    writer.endElement("td");
    @@ -206,62 +202,45 @@
    }
    writer.endElement("table");

    - writer.startElement("input", null);
    - writer.writeAttribute("type", "hidden", null);
    - writer.writeNameAttribute("/" + id + "/year");
    - writer.writeIdAttribute(id + ":year");
    - writer.writeAttribute("value", new Integer(calendar.get(Calendar.YEAR)), null);
    - writer.endElement("input");
    + writeInputHidden(writer, "/" + id + "/year", id + ":year", Integer.toString(calendar.get(Calendar.YEAR)));

    - writer.startElement("input", null);
    - writer.writeAttribute("type", "hidden", null);
    - writer.writeNameAttribute("/" + id + "/month");
    - writer.writeIdAttribute(id + ":month");
    - writer.writeAttribute("value", new Integer(1 + calendar.get(Calendar.MONTH)), null);
    - writer.endElement("input");
    + writeInputHidden(writer, "/" + id + "/month", id + ":month", Integer.toString(1 + calendar.get(Calendar.MONTH)));

    - writer.startElement("input", null);
    - writer.writeAttribute("type", "hidden", null);
    - writer.writeNameAttribute("/" + id + "/day");
    - writer.writeIdAttribute(id + ":day");
    - writer.writeAttribute("value", new Integer(calendar.get(Calendar.DAY_OF_MONTH)), null);
    - writer.endElement("input");
    + writeInputHidden(writer, "/" + id + "/day", id + ":day", Integer.toString(calendar.get(Calendar.DAY_OF_MONTH)));

    - writer.startElement("input", null);
    - writer.writeAttribute("type", "hidden", null);
    - writer.writeIdAttribute(id + ":firstDayOfWeek");
    - writer.writeAttribute("value", Integer.toString(calendar.getFirstDayOfWeek()), null);
    - writer.endElement("input");
    + writeInputHidden(writer, id + ":firstDayOfWeek", Integer.toString(calendar.getFirstDayOfWeek()), null);

    - writer.startElement("input", null);
    - writer.writeAttribute("type", "hidden", null);
    - writer.writeIdAttribute(id + ":monthNames");
    - writer.writeAttribute("value", getMonthNames(locale), null);
    - writer.endElement("input");
    + writeInputHidden(writer, id + ":monthNames", getMonthNames(locale), null);

    - writer.startElement("input", null);
    - writer.writeAttribute("type", "hidden", null);
    - writer.writeIdAttribute(id + ":fieldId");
    - writer.writeAttribute("value", "", null);
    - writer.endElement("input");
    + writeInputHidden(writer, id + ":fieldId", "");

    -// HtmlRendererUtil.writeJavascript(writer, "document.calendar = new Object();");
    HtmlRendererUtil.startJavascript(writer);
    writer.writeText("document.calendar = new Object();", null);

    if (dateTextBoxId != null) {
    -// page.getOnloadScripts().add("initCalendarParse('"
    -// + id + "', '" + dateTextBoxId + "');");
    writer.writeText(
    "initCalendarParse('" + id + "', '" + dateTextBoxId + "');", null);
    }
    HtmlRendererUtil.endJavascript(writer);
    -// writer.startElement("script", null);
    -// writer.writeAttribute("tyle", "text/javascript", null);
    -// writer.writeText("document.calendar = new Object();", null);
    -// writer.endElement("script");
    }
    + private void writeInputHidden(TobagoResponseWriter writer,
    + String id, Object value) throws IOException {
    + writer.startElement("input", null);
    + writer.writeAttribute("type", "hidden", null);
    + writer.writeIdAttribute(id);
    + writer.writeAttribute("value", value, null);
    + writer.endElement("input");
    + }

    + private void writeInputHidden(TobagoResponseWriter writer, String name,
    + String id, Object value) throws IOException {
    + writer.startElement("input", null);
    + writer.writeAttribute("type", "hidden", null);
    + writer.writeNameAttribute(name);
    + writer.writeIdAttribute(id);
    + writer.writeAttribute("value", value, null);
    + writer.endElement("input");
    + }

    private static String getClass(DateModel date, CalendarModel model) {
    return (date.getMonth() == model.getMonth())
    @@ -283,8 +262,6 @@
    }
    return buffer.toString();
    }
    -
    -// ///////////////////////////////////////////// bean getter + setter

    }
  • Bommel at Feb 4, 2006 at 9:54 pm
    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ColumnSelectorRenderer.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/ColumnSelectorRenderer.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/ColumnSelectorRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ColumnSelectorRenderer.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.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/DateRenderer.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/DateRenderer.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/DateRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.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;
    @@ -74,14 +76,7 @@

    public class DateRenderer extends InRenderer {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(DateRenderer.class);
    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code

    protected void renderMain(FacesContext facesContext, UIInput input, TobagoResponseWriter writer) throws IOException {

    @@ -147,8 +142,9 @@
    link.setActionListener(datePickerController);
    attributes.put(ATTR_LAYOUT_WIDTH, getConfiguredValue(facesContext, component, "pickerWidth"));

    - org.apache.myfaces.tobago.component.UIInput hidden = (org.apache.myfaces.tobago.component.UIInput) ComponentUtil.createComponent(
    - facesContext, org.apache.myfaces.tobago.component.UIInput.COMPONENT_TYPE, RENDERER_TYPE_HIDDEN);
    + org.apache.myfaces.tobago.component.UIInput hidden =
    + (org.apache.myfaces.tobago.component.UIInput) ComponentUtil.createComponent(facesContext,
    + org.apache.myfaces.tobago.component.UIInput.COMPONENT_TYPE, RENDERER_TYPE_HIDDEN);
    link.getChildren().add(hidden);
    hidden.setId(idPrefix + "Dimension");
    // attributes map is still of link
    @@ -267,8 +263,6 @@
    public int getComponentExtraWidth(FacesContext facesContext, UIComponent component) {
    return getConfiguredValue(facesContext, component, "pickerWidth");
    }
    -
    -// ///////////////////////////////////////////// bean getter + setter

    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DefaultLayoutRenderer.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/DefaultLayoutRenderer.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/DefaultLayoutRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DefaultLayoutRenderer.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;

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.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/FileRenderer.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/FileRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.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.fileupload.FileItem;
    import org.apache.commons.logging.Log;
    @@ -43,16 +45,8 @@

    public class FileRenderer extends InputRendererBase {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(FileRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public boolean getRendersChildren() {
    return true;
    }
    @@ -91,17 +85,16 @@
    // TODO PortletRequest ??
    if (request == null) {
    // should not be possible, because of the check in UIPage
    - LOG.error("Can't process multipart/form-data without TobagoRequest. " +
    - "Please check the web.xml and define a TobagoMultipartFormdataFilter. " +
    - "See documentation for <tc:file>");
    + LOG.error("Can't process multipart/form-data without TobagoRequest. "
    + + "Please check the web.xml and define a TobagoMultipartFormdataFilter. "
    + + "See documentation for <tc:file>");
    }

    FileItem item = request.getFileItem(input.getClientId(facesContext));

    if (LOG.isDebugEnabled()) {
    - LOG.debug(
    - "Uploaded file name : \"" + item.getName() +
    - "\" size = " + item.getSize());
    + LOG.debug("Uploaded file name : \"" + item.getName()
    + + "\" size = " + item.getSize());
    }
    input.setSubmittedValue(item);
    input.setValid(true);
    @@ -137,7 +130,5 @@
    writer.endElement("input");

    }
    -// ///////////////////////////////////////////// bean getter + setter
    -
    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.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/FormRenderer.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/FormRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.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.component.ComponentUtil;
    import org.apache.myfaces.tobago.component.UIPage;

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.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/GridLayoutRenderer.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/GridLayoutRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.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;
    @@ -64,24 +66,14 @@

    public class GridLayoutRenderer extends DefaultLayoutRenderer {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(GridLayoutRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public Dimension getFixedSize(FacesContext facesContext, UIComponent component) {
    Dimension dimension = null;

    int height = getFixedHeight(facesContext, component);
    int width = -1; // TODO. implement getFixedWidth

    -
    -
    dimension = new Dimension(width, height);

    return dimension;
    @@ -105,7 +97,7 @@
    String rowLayout
    = (String) layout.getAttributes().get(ATTR_ROWS);

    - if (rowLayout == null && ! minimum && LOG.isDebugEnabled()) {
    + if (rowLayout == null && !minimum && LOG.isDebugEnabled()) {
    LOG.debug("No rowLayout found using " + (minimum ? "'minimum'" : "'fixed'")
    + " for all " + rows.size() + " rows of "
    + layout.getClientId(facesContext) + " !");
    @@ -127,15 +119,12 @@
    String token = layoutTokens[i];
    if (token.matches("\\d+px")) {
    height += Integer.parseInt(token.replaceAll("\\D", ""));
    - }
    - else if (token.equals("fixed")) {
    + } else if (token.equals("fixed")) {
    height += getMaxHeight(facesContext, rows.get(i), false);
    - }
    - else if (token.equals("minimum")) {
    + } else if (token.equals("minimum")) {
    height += getMaxHeight(facesContext, rows.get(i), true);
    - }
    - else {
    - if (! minimum && LOG.isWarnEnabled()) {
    + } else {
    + if (!minimum && LOG.isWarnEnabled()) {
    LOG.warn("Unable to calculate Height for token '" + token
    + "'! using " + (minimum ? "'minimum'" : "'fixed'") + " , component:"
    + layout.getClientId(facesContext) + " is "
    @@ -175,7 +164,7 @@
    writer.startElement("colgroup", null);
    for (int i = 0; i < columnWidths.size(); i++) {
    int cellWidth
    - = ((Integer)columnWidths.get(i)).intValue();
    + = ((Integer) columnWidths.get(i)).intValue();
    if (cellWidth != LayoutInfo.HIDE) {
    cellWidth += getCellPadding(facesContext, layout, i);
    writer.startElement("col", null);
    @@ -190,7 +179,7 @@
    List<UIGridLayout.Row> rows = layout.ensureRows();
    for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
    UIGridLayout.Row row = rows.get(rowIndex);
    - if (! row.isHidden()) {
    + if (!row.isHidden()) {
    writer.startElement("tr", null);

    List cells = row.getElements();
    @@ -198,17 +187,17 @@
    boolean hide = false;

    if (columnWidths != null) {
    - Integer columWidth = ((Integer)columnWidths.get(columnIndex));
    + Integer columWidth = ((Integer) columnWidths.get(columnIndex));
    hide = columWidth.intValue() == LayoutInfo.HIDE;
    }
    - if (! hide) {
    + if (!hide) {

    Object object = cells.get(columnIndex);
    if (object.toString().equals(UIGridLayout.USED)) {
    continue; // ignore the markers UIGridLayout.Used
    }
    if (object.equals(UIGridLayout.FREE)) {
    - if (LOG.isWarnEnabled() && ! layout.isIgnoreFree()) {
    + if (LOG.isWarnEnabled() && !layout.isIgnoreFree()) {
    LOG.warn("There are free blocks in the layout: id='"
    + layout.getClientId(facesContext)
    + "'");
    @@ -245,19 +234,18 @@

    int cellHeight = -1;
    try {
    - Integer layoutHeight = LayoutUtil.getLayoutHeight(cell);
    + Integer layoutHeight = LayoutUtil.getLayoutHeight(cell);
    if (layoutHeight != null) {
    cellHeight = layoutHeight.intValue();
    }
    } catch (Exception e) {
    + // ignore
    } // ignore, use 0

    int topPadding = getCellPadding(facesContext, layout, rowIndex);
    - String cellStyle
    - = (cellWidth != -1 ? "width: " + cellWidth + "px;" : "")
    - + (cellHeight != -1 ?
    - " height: " + (cellHeight + topPadding) + "px;" : ""
    - );
    + String cellStyle =
    + (cellWidth != -1 ? "width: " + cellWidth + "px;" : "")
    + + (cellHeight != -1 ? " height: " + (cellHeight + topPadding) + "px;" : "");
    cellStyle += getOverflow(cell);


    @@ -298,8 +286,7 @@
    UIComponent component) throws IOException {
    if (component.getParent() instanceof UIPage) {
    LOG.error("XXXXXXXXXXXXXXXXXXXXXXX never XXXXXXXXXXXXXXXXXXXXXX", new Exception());
    - }
    - else {
    + } else {
    encodeChildrenOfComponent(facesContext, component.getParent());
    }
    }
    @@ -309,16 +296,13 @@

    String scrollbars = (String) cell.getAttributes().get(ATTR_SCROLLBARS);
    if (scrollbars != null) {
    - if (scrollbars.equals("false") ) {
    + if (scrollbars.equals("false")) {
    overflow = " overflow: hidden;";
    - }
    - else if (scrollbars.equals("true") ) {
    + } else if (scrollbars.equals("true")) {
    overflow = " overflow: scroll;";
    - }
    - else if (scrollbars.equals("auto") ) {
    + } else if (scrollbars.equals("auto")) {
    overflow = " overflow: auto;";
    - }
    - else {
    + } else {
    if (LOG.isWarnEnabled()) {
    LOG.warn("Illegal value for attribute 'scrollbars' : " + scrollbars);
    }
    @@ -381,8 +365,8 @@
    return Integer.parseInt(cellspacing);
    } catch (NumberFormatException e) {
    if (LOG.isWarnEnabled()) {
    - LOG.warn("Illegal value for cellspacing : " + cellspacing +
    - " using default");
    + LOG.warn("Illegal value for cellspacing : " + cellspacing
    + + " using default");
    }
    // ignore and return defaut value
    }
    @@ -447,11 +431,11 @@
    layout.getAttributes().get(ATTR_COLUMNS), columnCount);


    - if (! rows.isEmpty()) {
    + if (!rows.isEmpty()) {
    UIGridLayout.Row row = rows.get(0);
    final List cells = row.getElements();

    - for (int i = 0; i< cells.size() ; i++) {
    + for (int i = 0; i < cells.size(); i++) {
    Object cell = cells.get(i);
    boolean hidden = false;
    if (isHidden(cell)) {
    @@ -481,9 +465,9 @@
    }

    private boolean isHidden(Object cell) {
    - return (cell instanceof UIComponent && !((UIComponent)cell).isRendered())
    + return (cell instanceof UIComponent && !((UIComponent) cell).isRendered())
    (cell instanceof UIGridLayout.Marker
    - && ! ((UIGridLayout.Marker)cell).isRendered());
    + && !((UIGridLayout.Marker) cell).isRendered());
    }

    private void layoutHeight(Integer innerHeight, UIGridLayout layout,
    @@ -538,7 +522,7 @@
    if (tokens[i].equals("fixed")) {
    int max = 0;
    final List<UIGridLayout.Row> rows = layout.ensureRows();
    - if (! rows.isEmpty()) {
    + if (!rows.isEmpty()) {
    if (width) {
    max = getMaxWidth(facesContext, rows, i, false);
    } else {

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.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/HiddenRenderer.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/HiddenRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.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.component.ComponentUtil;
    import org.apache.myfaces.tobago.renderkit.InputRendererBase;
    @@ -29,16 +31,6 @@

    public class HiddenRenderer extends InputRendererBase {

    -// ///////////////////////////////////////////// constant
    -
    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    -
    -
    public void encodeEndTobago(FacesContext facesContext,
    UIComponent component) throws IOException {

    @@ -55,7 +47,6 @@
    writer.endElement("input");
    }

    -// ///////////////////////////////////////////// bean getter + setter

    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.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/ImageRenderer.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/ImageRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.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,14 +43,9 @@

    public class ImageRenderer extends RendererBase {

    -// ------------------------------------------------------------------ constants

    private static final Log LOG = LogFactory.getLog(ImageRenderer.class);

    -// ----------------------------------------------------------------- interfaces
    -
    -
    -// ---------------------------- interface TobagoRenderer

    public void encodeEndTobago(FacesContext facesContext,
    UIComponent component) throws IOException {
    @@ -108,8 +105,6 @@
    writer.writeComponentClass();
    writer.endElement("img");
    }
    -
    -// ----------------------------------------------------------- business methods

    public static void addImageSources(
    FacesContext facesContext, UIGraphic graphic) {

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.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/InRenderer.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/InRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.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;
    @@ -52,8 +54,6 @@
    public class InRenderer extends InRendererBase implements AjaxRenderer {
    private static final Log LOG = LogFactory.getLog(InRenderer.class);

    -// ----------------------------------------------------------- business methods
    -
    protected void renderMain(FacesContext facesContext, UIInput input,
    TobagoResponseWriter writer) throws IOException {
    Iterator messages = facesContext.getMessages(
    @@ -83,7 +83,7 @@
    boolean renderAjaxSuggest = false;
    if (input instanceof org.apache.myfaces.tobago.component.UIInput) {
    renderAjaxSuggest =
    - ((org.apache.myfaces.tobago.component.UIInput)input).getSuggestMethod() != null;
    + ((org.apache.myfaces.tobago.component.UIInput) input).getSuggestMethod() != null;
    }

    String onchange = HtmlUtils.generateOnchange(input, facesContext);
    @@ -159,9 +159,9 @@
    String function = "return entry";
    if (facesContext.getApplication().getStateManager().isSavingStateInClient(facesContext)) {
    function +=
    - "+'&jsf_tree_64='+encodeURIComponent($('jsf_tree_64').value)" +
    - "+'&jsf_state_64='+encodeURIComponent($('jsf_state_64').value)" +
    - "+'&jsf_viewid='+encodeURIComponent($('jsf_viewid').value)";
    + "+'&jsf_tree_64='+encodeURIComponent($('jsf_tree_64').value)"
    + + "+'&jsf_state_64='+encodeURIComponent($('jsf_state_64').value)"
    + + "+'&jsf_viewid='+encodeURIComponent($('jsf_viewid').value)";
    }

    final String[] cmds = {
    @@ -212,22 +212,22 @@
    }


    - int maxSuggestedCount = 25 ;//input.getMaxSuggestedItems()!=null
    + int maxSuggestedCount = 25; //input.getMaxSuggestedItems()!=null
    // ? input.getMaxSuggestedItems().intValue()
    // : DEFAULT_MAX_SUGGESTED_ITEMS;

    - List suggesteds = (List) mb.invoke(context,new Object[]{
    + List suggesteds = (List) mb.invoke(context, new Object[]{
    AjaxPhaseListener.getValueForComponent(context, uiComponent)});


    StringBuffer buf = new StringBuffer();
    buf.append("<ul>");

    - int suggestedCount=0;
    - for (Iterator i = suggesteds.iterator() ; i.hasNext() ; suggestedCount++)
    - {
    - if( suggestedCount > maxSuggestedCount )
    + int suggestedCount = 0;
    + for (Iterator i = suggesteds.iterator(); i.hasNext(); suggestedCount++) {
    + if (suggestedCount > maxSuggestedCount) {
    break;
    + }

    buf.append("<li>");
    buf.append(i.next().toString());

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.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/LabelRenderer.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/LabelRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.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;
    @@ -98,12 +100,12 @@
    writer.writeAttribute("for", forValue, null);
    }
    writer.writeComponentClass();
    - 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);
    }
    if (width != null) {
    writer.writeAttribute("style", "width: " + width + "px;", null);

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabeledInputLayoutRenderer.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/LabeledInputLayoutRenderer.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/LabeledInputLayoutRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabeledInputLayoutRenderer.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;

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.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/LinkRenderer.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/LinkRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.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;
    @@ -62,21 +64,19 @@
    if (action == null) {
    LOG.warn("keine Action in Link : id " + component.getClientId(facesContext)
    + " label = " + component.getAttributes().get(ATTR_LABEL)
    - + " labelwithkey = " + component.getAttributes().get(ATTR_LABEL_WITH_ACCESS_KEY)
    - );
    + + " labelwithkey = " + component.getAttributes().get(ATTR_LABEL_WITH_ACCESS_KEY));
    action = "";
    }
    href = HtmlUtils.generateUrl(facesContext, action);
    } else if (COMMAND_TYPE_RESET.equals(type)) {
    - href = "javascript:resetForm('" +
    - ComponentUtil.findPage(component).getFormId(facesContext) +
    - "')";
    + href = "javascript:resetForm('"
    + + ComponentUtil.findPage(component).getFormId(facesContext) + "')";
    } else if (COMMAND_TYPE_SCRIPT.equals(type)) {
    href = "#";
    onclick = action;
    } else { // default: Action.TYPE_SUBMIT
    - href = "javascript:submitAction('" +
    - ComponentUtil.findPage(component).getFormId(facesContext)
    + href = "javascript:submitAction('"
    + + ComponentUtil.findPage(component).getFormId(facesContext)
    + "','" + component.getClientId(facesContext) + "')";
    }

    @@ -99,12 +99,12 @@
    }
    writer.writeAttribute("title", null, ATTR_TIP);
    writer.writeAttribute("target", null, ATTR_TARGET);
    - 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);
    }
    writer.writeText("", null); // force closing the start tag
    }

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.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/MenuBarRenderer.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/MenuBarRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.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;
    @@ -72,14 +74,9 @@
    import java.util.StringTokenizer;

    public class MenuBarRenderer extends RendererBase {
    -// ------------------------------------------------------------------ constants

    private static final Log LOG = LogFactory.getLog(MenuBarRenderer.class);

    -// ----------------------------------------------------------------- interfaces
    -
    -
    -// ---------------------------- interface TobagoRenderer

    public void encodeEndTobago(FacesContext facesContext,
    UIComponent component) throws IOException {
    @@ -111,8 +108,6 @@
    scriptBuffer.toString());
    }

    -// ----------------------------------------------------------- business methods
    -
    protected void addScriptsAndStyles(FacesContext facesContext,
    UIComponent component, final String clientId, String setupFunction,
    String scriptBlock) throws IOException {
    @@ -193,9 +188,8 @@
    }

    String name = var + "_" + i++;
    - sb.append(
    - " var " + name + " = " + createMenuEntry(facesContext, menu) +
    - ";\n");
    + sb.append(" var " + name + " = "
    + + createMenuEntry(facesContext, menu) + ";\n");
    sb.append(" " + var + ".addMenuItem(" + name + ");\n");
    addMenuEntrys(sb, name, facesContext, menu, false);
    return i;
    @@ -236,12 +230,12 @@
    writer.writeAttribute("onkeydown", "tobagoMenuKeyDown(event)", null);
    writer.writeAttribute("onkeypress", "tobagoMenuKeyPress(event)", null);
    if (label.getText() != 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);
    }
    HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
    }
    @@ -331,9 +325,9 @@
    } else if (COMMAND_TYPE_SCRIPT.equals(type)) {
    onclick = command;
    } else { // default: Action.TYPE_SUBMIT
    - onclick = "submitAction('" +
    - ComponentUtil.findPage(component).getFormId(facesContext) +
    - "','" + clientId + "')";
    + onclick = "submitAction('"
    + + ComponentUtil.findPage(component).getFormId(facesContext)
    + + "','" + clientId + "')";
    }
    return onclick;
    }
    @@ -402,13 +396,13 @@
    String onClickPostfix = onClick != null ? "') ; " + onClick : "";
    for (SelectItem item : items) {
    final String labelText = item.getLabel();
    - label.accessKey = null;
    + label.setAccessKey(null);
    if (labelText != null) {
    if (labelText.indexOf(LabelWithAccessKey.INDICATOR) > -1) {
    - label.text = null;
    + label.setText(null);
    label.setup(labelText);
    } else {
    - label.text = labelText;
    + label.setText(labelText);
    }
    } else {
    LOG.warn("Menu item has label=null. UICommand.getClientId()="
    @@ -453,12 +447,12 @@

    writer.startElement("a", null);
    writer.writeClassAttribute(spanClass);
    - 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);
    }
    writer.writeAttribute("href", "#", null);
    writer.writeAttribute("onfocus", "tobagoMenuFocus(event)", null);
    @@ -491,8 +485,8 @@
    }

    private void addMenuSeparator(StringBuffer sb, String var) {
    - String html = "<div style=\"text-align: center;\">" +
    - "<hr class=\"tobago-menuBar-separator\"></div>";
    + String html = "<div style=\"text-align: center;\">"
    + + "<hr class=\"tobago-menuBar-separator\"></div>";

    sb.append(" ");
    sb.append(var);

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.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/MenuCommandRenderer.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/MenuCommandRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuCommandRenderer.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 21.09.2004 at 17:26:57.
    * $Id$
    */
    -package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;

    import org.apache.myfaces.tobago.renderkit.CommandRendererBase;


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.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/MessageRenderer.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/MessageRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.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;
    @@ -35,26 +37,18 @@

    public class MessageRenderer extends MessageRendererBase {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(MessageRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public int getFixedHeight(FacesContext facesContext, UIComponent component) {
    if (LOG.isDebugEnabled()) {
    LOG.debug("component = '" + component + "'");
    }
    String clientId = null;
    if (component instanceof UIMessage) {
    - clientId = ((UIMessage)component).getFor();
    + clientId = ((UIMessage) component).getFor();
    }
    int count = 0;
    - for (Iterator i = facesContext.getMessages(clientId); i.hasNext(); ) {
    + for (Iterator i = facesContext.getMessages(clientId); i.hasNext();) {
    count++;
    }
    if (LOG.isDebugEnabled()) {

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.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/MessagesRenderer.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/MessagesRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.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;
    @@ -35,15 +37,8 @@

    public class MessagesRenderer extends MessageRendererBase {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(MessagesRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code

    public int getFixedHeight(FacesContext facesContext, UIComponent component) {
    int count = 0;

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.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/ObjectRenderer.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/ObjectRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java Sat Feb 4 13:47:46 2006
    @@ -1,19 +1,21 @@
    +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 static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TARGET;

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.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/OutRenderer.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/OutRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.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_CREATE_SPAN;
    import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ESCAPE;
    @@ -33,13 +35,6 @@
    import java.util.StringTokenizer;

    public class OutRenderer extends RendererBase {
    -
    -// ------------------------------------------------------------------ constants
    -
    -// ----------------------------------------------------------------- interfaces
    -
    -
    -// ---------------------------- interface TobagoRenderer

    public void encodeEndTobago(FacesContext facesContext,
    UIComponent component) throws IOException {

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.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/PageRenderer.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/PageRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.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
    + * 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.
    * $Id$
    */
    -package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -68,19 +70,19 @@
    // default value is 'loose'

    private static final String LOOSE =
    - "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"" +
    - /*" \"http://www.w3.org/TR/html4/loose.dtd\*/">";
    + "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\""
    + + /*" \"http://www.w3.org/TR/html4/loose.dtd\*/">";
    // TODO: this is commented, because the some pages in IE and mozilla
    // does work properly with it:
    // tobago-demo: sometimes the body has not height=100% in mozilla.

    private static final String STRICT =
    - "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"" +
    - " \"http://www.w3.org/TR/html4/strict.dtd\">";
    + "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\""
    + + " \"http://www.w3.org/TR/html4/strict.dtd\">";

    private static final String FRAMESET =
    - "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\"" +
    - " \"http://www.w3.org/TR/html4/frameset.dtd\">";
    + "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\""
    + + " \"http://www.w3.org/TR/html4/frameset.dtd\">";

    // ----------------------------------------------------------------- interfaces

    @@ -340,14 +342,14 @@
    logMessages.add(errorMessageForDebugging(id, message));
    }
    }
    - if (! logMessages.isEmpty()) {
    + if (!logMessages.isEmpty()) {
    logMessages.add(0, "LOG.show();");
    }

    logMessages.add("LOG.info(\"FacesContext = " + facesContext + "\");");

    HtmlRendererUtil.writeScriptLoader(facesContext, null,
    - logMessages.toArray(new String[logMessages.size()] ));
    + logMessages.toArray(new String[logMessages.size()]));
    }

    writer.endElement("body");
    @@ -375,7 +377,7 @@
    scripts = ResourceManagerUtil.getScripts(facesContext, script);
    }
    for (String scriptString : scripts) {
    - if (scriptString.length() > 0 ) {
    + if (scriptString.length() > 0) {
    writer.startElement("script", null);
    writer.writeAttribute("src", scriptString, null);
    writer.writeAttribute("type", "text/javascript", null);

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.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/PanelRenderer.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/PanelRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.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;
    @@ -68,8 +70,7 @@

    if (component.getChildren().size() == 0) {
    height = 0;
    - }
    - else {
    + } else {

    if (LOG.isDebugEnabled()) {
    LOG.debug("Can't calculate fixedHeight! "
    @@ -104,8 +105,8 @@
    public void encodeChildrenTobago(FacesContext facesContext,
    UIComponent uiComponent) throws IOException {

    - UIPanel component = (UIPanel) uiComponent ;
    - for (Iterator i = component.getChildren().iterator(); i.hasNext(); ) {
    + UIPanel component = (UIPanel) uiComponent;
    + for (Iterator i = component.getChildren().iterator(); i.hasNext();) {
    UIComponent child = (UIComponent) i.next();
    RenderUtil.encode(facesContext, child);
    }

    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.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/PopupRenderer.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/PopupRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.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;
    @@ -50,7 +52,7 @@
    FacesContext facesContext, UIComponent uiComponent) throws IOException {

    TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
    - UIPopup component = (UIPopup) uiComponent ;
    + UIPopup component = (UIPopup) uiComponent;
    final String clientId = component.getClientId(facesContext);
    final String contentDivId = clientId + CONTENT_ID_POSTFIX;
    final String left = component.getLeft();
    @@ -58,19 +60,19 @@

    final StringBuffer contentStyle = new StringBuffer();
    if (component.getWidth() != null) {
    - contentStyle.append("width: " );
    + contentStyle.append("width: ");
    contentStyle.append(component.getWidth());
    contentStyle.append("; ");
    }
    if (component.getHeight() != null) {
    - contentStyle.append("height: " );
    + contentStyle.append("height: ");
    contentStyle.append(component.getHeight());
    contentStyle.append("; ");
    }
    - contentStyle.append("left: " );
    + contentStyle.append("left: ");
    contentStyle.append(left != null ? left : "100");
    contentStyle.append("; ");
    - contentStyle.append("top: " );
    + contentStyle.append("top: ");
    contentStyle.append(top != null ? top : "50");
    contentStyle.append("; ");

    @@ -99,7 +101,7 @@
    public void encodeEndTobago(FacesContext facesContext,
    UIComponent uiComponent) throws IOException {
    ResponseWriter writer = facesContext.getResponseWriter();
    - UIPopup component = (UIPopup) uiComponent ;
    + UIPopup component = (UIPopup) uiComponent;
    final String clientId = component.getClientId(facesContext);

    writer.endElement("div");
    @@ -112,8 +114,5 @@
    component.setRendered(false);
    }
    }
    -
    -// ///////////////////////////////////////////// bean getter + setter
    -
    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.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/ProgressRenderer.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/ProgressRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.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;
    @@ -35,16 +37,8 @@

    public class ProgressRenderer extends RendererBase {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(ProgressRenderer.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public void encodeEndTobago(FacesContext facesContext,
    UIComponent uiComponent) throws IOException {

    @@ -54,7 +48,7 @@

    if (model == null) {
    LOG.warn("'null' value found! Using dummy Model instead!");
    - model = new DefaultBoundedRangeModel(40,1,0,100);
    + model = new DefaultBoundedRangeModel(40, 1, 0, 100);
    }

    String image = ResourceManagerUtil.getImageWithPath(facesContext, "image/1x1.gif");
    @@ -66,8 +60,8 @@

    String title = (String) component.getAttributes().get(ATTR_TIP);
    if (title == null) {
    - title = Integer.toString(100 * model.getValue() /
    - (model.getMaximum() - model.getMinimum()))
    + title = Integer.toString(100 * model.getValue()
    + / (model.getMaximum() - model.getMinimum()))
    + " %";
    }

    @@ -96,8 +90,6 @@

    writer.endElement("span");
    }
    -
    -// ///////////////////////////////////////////// bean getter + setter

    }


    Modified: incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.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/RichTextEditorRenderer.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/RichTextEditorRenderer.java (original)
    +++ incubator/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.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;
    @@ -59,8 +61,6 @@
    /** TODO: under construction */
    public class RichTextEditorRenderer extends InputRendererBase {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(RichTextEditorRenderer.class);

    public static final String CHANGE_BUTTON = "togleState";
    @@ -73,15 +73,15 @@
    super.decode(facesContext, component);
    String actionId = ComponentUtil.findPage(component).getActionId();
    if (actionId != null
    - && actionId.equals(component.getClientId(facesContext) + CHANGE_BUTTON)){
    + && actionId.equals(component.getClientId(facesContext) + CHANGE_BUTTON)) {
    boolean state
    = ComponentUtil.getBooleanAttribute(component, ATTR_STATE_PREVIEW);
    component.getAttributes().put(ATTR_STATE_PREVIEW,
    - new Boolean(! state));
    + new Boolean(!state));
    facesContext.renderResponse();

    }
    - ((EditableValueHolder)component).setValid(true);
    + ((EditableValueHolder) component).setValid(true);
    }

    public static String contentToHtml(String content) {
    @@ -149,8 +149,7 @@
    writer.write(RichTextEditorRenderer.contentToHtml(content));

    writer.endElement("div");
    - }
    - else {
    + } else {
    writer.startElement("textarea", component);
    writer.writeClassAttribute(classes + " tobago-richTextEditor-body");
    writer.writeNameAttribute(clientId);
  • Bommel at Feb 4, 2006 at 9:54 pm
    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);
  • Bommel at Feb 4, 2006 at 9:54 pm
    Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/LogoutActionListener.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.webapp;
    +
    /*
    * 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 25.10.2004 17:57:53.
    * $Id$
    */
    -package org.apache.myfaces.tobago.webapp;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -41,7 +43,7 @@
    Object session = externalContext.getSession(false);
    if (session != null) {
    if (session instanceof HttpSession) {
    - ((HttpSession)session).invalidate();
    + ((HttpSession) session).invalidate();
    }
    // TODO: PortletRequest ??
    }

    Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataFilter.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,20 @@
    +package org.apache.myfaces.tobago.webapp;
    +
    /*
    * 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 30.01.2003 17:00:56.
    - * $Id$
    - */
    -package org.apache.myfaces.tobago.webapp;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -34,17 +31,9 @@

    public class TobagoMultipartFormdataFilter implements Filter {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG
    = LogFactory.getLog(TobagoMultipartFormdataFilter.class);

    -// ///////////////////////////////////////////// attribute
    -
    -// ///////////////////////////////////////////// constructor
    -
    -// ///////////////////////////////////////////// code
    -
    public void init(FilterConfig filterConfig) throws ServletException {
    }

    @@ -59,12 +48,12 @@
    wrapper = request;
    } else {
    String contentType = request.getContentType();
    - if (contentType != null &&
    - contentType.toLowerCase().startsWith("multipart/form-data")) {
    + if (contentType != null
    + && contentType.toLowerCase().startsWith("multipart/form-data")) {
    if (LOG.isDebugEnabled()) {
    LOG.debug("Wrapping " + request.getClass().getName()
    - + " with ContentType=\"" + contentType + "\" " +
    - "into TobagoMultipartFormdataRequest");
    + + " with ContentType=\"" + contentType + "\" "
    + + "into TobagoMultipartFormdataRequest");
    }
    wrapper = new TobagoMultipartFormdataRequest(
    (HttpServletRequest) request);

    Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataRequest.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataRequest.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataRequest.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoMultipartFormdataRequest.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,20 @@
    +package org.apache.myfaces.tobago.webapp;
    +
    /*
    * 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.
    - */
    -/*
    - * Created 30.01.2003 17:00:56.
    - * $Id$
    + *
    + * 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.webapp;

    import org.apache.commons.fileupload.DiskFileUpload;
    import org.apache.commons.fileupload.FileItem;
    @@ -39,24 +36,18 @@

    public class TobagoMultipartFormdataRequest extends HttpServletRequestWrapper {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG
    = LogFactory.getLog(TobagoMultipartFormdataRequest.class);

    -// ///////////////////////////////////////////// attribute
    -
    private Map parameters;

    private Map fileItems;

    -// ///////////////////////////////////////////// constructor
    -
    TobagoMultipartFormdataRequest(HttpServletRequest request) {
    super(request);
    String contentType = request.getContentType();
    - if (contentType == null ||
    - !contentType.toLowerCase().startsWith("multipart/form-data")) {
    + if (contentType == null
    + || !contentType.toLowerCase().startsWith("multipart/form-data")) {
    String errorText = "contentType is not multipart/form-data but '"
    + contentType + "'";
    LOG.error(errorText);
    @@ -131,17 +122,12 @@
    }
    }

    -// ////////////////////////////////////////////// code
    -
    public FileItem getFileItem(String key) {
    if (fileItems != null) {
    return (FileItem) fileItems.get(key);
    }
    return null;
    }
    -
    -// ////////////////////////////////////////////// overwriten
    -

    public String getParameter(String key) {
    String parameter = null;

    Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponse.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponse.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponse.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponse.java Sat Feb 4 13:47:46 2006
    @@ -1,19 +1,20 @@
    +package org.apache.myfaces.tobago.webapp;
    +
    /*
    * 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.webapp;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -45,7 +46,7 @@
    public void setBuffering() {
    if (bufferedWriter == null) {
    bufferedWriter = new StringWriter();
    - printWriter = new PrintWriter(bufferedWriter) ;
    + printWriter = new PrintWriter(bufferedWriter);
    }
    }
    public String getBufferedString() {

    Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,20 @@
    +package org.apache.myfaces.tobago.webapp;
    +
    /*
    * 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.
    - */
    -/*
    - * Created 07.01.2004 10:34:32.
    - * $Id$
    + *
    + * 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.webapp;

    import org.apache.commons.lang.StringUtils;
    import org.apache.commons.logging.Log;
    @@ -38,8 +35,6 @@

    public class TobagoResponseWriter extends ResponseWriter {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(TobagoResponseWriter.class);

    private static final Set<String> EMPTY_TAG
    @@ -50,8 +45,6 @@
    "meta"}));


    -// ///////////////////////////////////////////// attribute
    -
    private Writer writer;

    private UIComponent component;
    @@ -72,9 +65,6 @@
    private HtmlWriterUtil attributeWriter;
    private HtmlWriterUtil textWriter;

    -
    -// ///////////////////////////////////////////// constructor
    -
    public TobagoResponseWriter(final Writer writer, final String contentType,
    final String characterEncoding) {
    // LOG.info("new TobagoResponseWriter!");
    @@ -95,8 +85,6 @@
    textWriter = new HtmlWriterUtil(this, characterEncoding, false);
    }

    -// ///////////////////////////////////////////// code
    -
    private String findValue(final Object value, final String property) {
    if (value != null) {
    return value instanceof String ? (String) value : value.toString();
    @@ -110,9 +98,8 @@
    }
    } else {
    final String trace = getCallingClassStackTraceElementString();
    - LOG.error(
    - "Don't know what to do! " +
    - "Property defined, but no component to get a value. "
    + LOG.error("Don't know what to do! "
    + + "Property defined, but no component to get a value. "
    + trace.substring(trace.indexOf('(')));
    LOG.error("value = '" + value + "'");
    LOG.error("property = '" + property + "'");
    @@ -120,9 +107,8 @@
    }
    } else {
    final String trace = getCallingClassStackTraceElementString();
    - LOG.error(
    - "Don't know what to do! " +
    - "No value and no property defined. "
    + LOG.error("Don't know what to do! "
    + + "No value and no property defined. "
    + trace.substring(trace.indexOf('(')));
    LOG.error("value = '" + value + "'");
    LOG.error("property = '" + property + "'");
    @@ -130,7 +116,7 @@
    }
    }

    - public void write(final char cbuf[], final int off, final int len)
    + public void write(final char[] cbuf, final int off, final int len)
    throws IOException {
    writer.write(cbuf, off, len);
    }
    @@ -169,7 +155,7 @@
    }
    }

    - public void writeText(final char text[], final int offset, final int length)
    + public void writeText(final char[] text, final int offset, final int length)
    throws IOException {
    if (startStillOpen) {
    writer.write("\n>");
    @@ -207,9 +193,9 @@
    public void startElement(final String name) throws IOException {
    startElement(name, null);
    }
    - public void startElement(final String name, final UIComponent component)
    + public void startElement(final String name, final UIComponent currentComponent)
    throws IOException {
    - this.component = component;
    + this.component = currentComponent;
    stack.push(name);
    // closeStartIfNecessary();
    insideScriptOrStyle = isScriptOrStyle(name);
    @@ -231,7 +217,7 @@
    switch (name.charAt(1)) {
    case 'c' :
    if (name.charAt(2) == 'r' && name.charAt(3) == 'i'
    - && name.charAt(4) == 'p' && name.charAt(5) == 't' ) {
    + && name.charAt(4) == 'p' && name.charAt(5) == 't') {
    return true;
    }
    break;
    @@ -241,10 +227,16 @@
    return true;
    }
    break;
    + default:
    + return false;
    }
    break;
    + default:
    + return false;
    }
    - } catch (Exception e) { /* ignore */ }
    + } catch (Exception e) {
    + /* ignore */
    + }
    return false;
    }

    @@ -256,8 +248,7 @@
    final String top = stack.pop();
    if (!top.equals(name)) {
    final String trace = getCallingClassStackTraceElementString();
    - LOG.error(
    - "Element end with name='" + name + "' doesn't "
    + LOG.error("Element end with name='" + name + "' doesn't "
    + "match with top element on the stack='" + top + "' "
    + trace.substring(trace.indexOf('(')));
    }
    @@ -301,9 +292,9 @@
    write("-->");
    }

    - public ResponseWriter cloneWithWriter(final Writer writer) {
    + public ResponseWriter cloneWithWriter(final Writer originalWriter) {
    return new TobagoResponseWriter(
    - writer, getContentType(), getCharacterEncoding());
    + originalWriter, getContentType(), getCharacterEncoding());
    }

    public void writeAttribute(final String name, final boolean on) throws IOException {
    @@ -420,7 +411,5 @@
    throws IOException {
    LOG.error("Not implemented yet!"); // FIXME jsfbeta
    }
    -
    -// ///////////////////////////////////////////// bean getter + setter

    }

    Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,20 @@
    +package org.apache.myfaces.tobago.webapp;
    +
    /*
    * 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.
    - */
    -/*
    - * Created Nov 13, 2002 at 8:43:20 AM.
    - * $Id$
    + *
    + * 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.webapp;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -33,13 +30,9 @@

    public class TobagoServletContextListener implements ServletContextListener {

    -// ///////////////////////////////////////////// constants
    -
    private static final Log LOG
    = LogFactory.getLog(TobagoServletContextListener.class);

    -// ///////////////////////////////////////////// code
    -
    public void contextInitialized(ServletContextEvent event) {

    if (LOG.isInfoEnabled()) {
    @@ -68,8 +61,8 @@

    } catch (Throwable e) {
    if (LOG.isFatalEnabled()) {
    - String error = "Error while deploy process. Tobago can't be initialized! " +
    - "Application will not run!";
    + String error = "Error while deploy process. Tobago can't be initialized! "
    + + "Application will not run!";
    LOG.fatal(error, e);
    throw new RuntimeException(error, e);
    }

    Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/WeblogicWorkaroundServlet.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,20 @@
    +package org.apache.myfaces.tobago.webapp;
    +
    /*
    * 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.
    - */
    -/*
    - * Created 13.07.2004 12:34:10.
    - * $Id$
    + *
    + * 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.webapp;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -38,12 +35,9 @@
    */

    public class WeblogicWorkaroundServlet extends HttpServlet {
    -// ------------------------------------------------------------------ constants

    private static final Log LOG
    = LogFactory.getLog(WeblogicWorkaroundServlet.class);
    -
    -// ----------------------------------------------------------- business methods

    public void init() throws ServletException {
    if (LOG.isDebugEnabled()) {

    Modified: incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java (original)
    +++ incubator/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java Sat Feb 4 13:47:46 2006
    @@ -32,7 +32,7 @@
    LabelWithAccessKey label = new LabelWithAccessKey(component);
    assertEquals("Save", label.getText());
    assertEquals(-1, label.getPos());
    - assertEquals(null, label.getAccessKey());
    + assertEquals(null, label.getAccessKey1());
    }

    // code-sniplet-start id="test1"
    @@ -43,7 +43,7 @@
    LabelWithAccessKey label = new LabelWithAccessKey(component);
    assertEquals("Save", label.getText());
    assertEquals(0, label.getPos());
    - assertEquals(new Character('s'), label.getAccessKey());
    + assertEquals(new Character('s'), label.getAccessKey1());
    }
    // code-sniplet-end id="test1"

    @@ -54,7 +54,7 @@
    LabelWithAccessKey label = new LabelWithAccessKey(component);
    assertEquals("Save", label.getText());
    assertEquals(3, label.getPos());
    - assertEquals(new Character('E'), label.getAccessKey());
    + assertEquals(new Character('E'), label.getAccessKey1());
    }

    public void testAmpersand() {
    @@ -63,7 +63,7 @@
    LabelWithAccessKey label = new LabelWithAccessKey(component);
    assertEquals("Save", label.getText());
    assertEquals(0, label.getPos());
    - assertEquals(new Character('S'), label.getAccessKey());
    + assertEquals(new Character('S'), label.getAccessKey1());
    }

    public void testAmpersandAtEnd() {
    @@ -72,7 +72,7 @@
    LabelWithAccessKey label = new LabelWithAccessKey(component);
    assertEquals("Save", label.getText());
    assertEquals(-1, label.getPos());
    - assertEquals(null, label.getAccessKey());
    + assertEquals(null, label.getAccessKey1());
    }

    public void testAmpersandNo() {
    @@ -81,7 +81,7 @@
    LabelWithAccessKey label = new LabelWithAccessKey(component);
    assertEquals("Save", label.getText());
    assertEquals(-1, label.getPos());
    - assertEquals(null, label.getAccessKey());
    + assertEquals(null, label.getAccessKey1());
    }

    public void testMixed() {
    @@ -92,7 +92,7 @@
    LabelWithAccessKey label = new LabelWithAccessKey(component);
    assertEquals("Save", label.getText());
    assertEquals(2, label.getPos());
    - assertEquals(new Character('v'), label.getAccessKey());
    + assertEquals(new Character('v'), label.getAccessKey1());
    }

    }

    Modified: incubator/tobago/trunk/tobago-example/pom.xml
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/pom.xml?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/pom.xml (original)
    +++ incubator/tobago/trunk/tobago-example/pom.xml Sat Feb 4 13:47:46 2006
    @@ -1,5 +1,24 @@
    -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 " rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd">
    +<?xml version="1.0" encoding="UTF-8"?>
    +
    +<!--
    + * 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.
    +-->
    +
    +<project xmlns="http://maven.apache.org/POM/4.0.0"
    + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 " rel="nofollow">http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
    <groupId>org.apache.myfaces.tobago</groupId>
    @@ -10,6 +29,26 @@
    <name>Tobago Examples</name>
    <groupId>org.apache.myfaces.tobago</groupId>
    <artifactId>tobago-example</artifactId>
    + <reporting>
    + <plugins>
    +
    + <plugin>
    + <groupId>org.codehaus.mojo</groupId>
    + <artifactId>jxr-maven-plugin</artifactId>
    + </plugin>
    +
    + <plugin>
    + <groupId>org.apache.maven.plugins</groupId>
    + <artifactId>maven-checkstyle-plugin</artifactId>
    + <configuration>
    + <configLocation>org/apache/myfaces/tobago/checkstyle.xml</configLocation>
    + <xrefLocation>xref</xrefLocation>
    + <excludes>**/package-info.java</excludes>
    + </configuration>
    + </plugin>
    +
    + </plugins>
    + </reporting>
    <modules>
    <module>tobago-example-addressbook</module>
    <module>tobago-example-blank</module>

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Address.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,26 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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 29.11.2004 17:25:39.
    * $Id: Address.java,v 1.1.1.1 2004/12/15 12:51:35 lofwyr Exp $
    */
    -package org.apache.myfaces.tobago.example.addressbook;
    +

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressConverter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressConverter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressConverter.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressConverter.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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 03.12.2004 00:08:01.
    * $Id: AddressConverter.java,v 1.1.1.1 2004/12/15 12:51:35 lofwyr Exp $
    */
    -package org.apache.myfaces.tobago.example.addressbook;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAO.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAO.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAO.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAO.java Sat Feb 4 13:47:46 2006
    @@ -1,22 +1,25 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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 29.11.2004 17:36:20.
    * $Id: Controller.java,v 1.2 2005/08/10 11:57:55 lofwyr Exp $
    - */package org.apache.myfaces.tobago.example.addressbook;
    + */

    import java.util.List;


    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAOException.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAOException.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAOException.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/AddressDAOException.java Sat Feb 4 13:47:46 2006
    @@ -1,5 +1,21 @@
    package org.apache.myfaces.tobago.example.addressbook;

    +/*
    + * 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.
    + */
    +
    public class AddressDAOException extends Exception {

    public AddressDAOException() {

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Controller.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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 29.11.2004 17:36:20.
    * $Id: Controller.java,v 1.2 2005/08/10 11:57:55 lofwyr Exp $
    */
    -package org.apache.myfaces.tobago.example.addressbook;

    import org.apache.commons.fileupload.FileItem;
    import org.apache.commons.logging.Log;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Countries.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Countries.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Countries.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/Countries.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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 02.12.2004 21:42:13.
    * $Id: Countries.java,v 1.1.1.1 2004/12/15 12:51:35 lofwyr Exp $
    */
    -package org.apache.myfaces.tobago.example.addressbook;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/EmailAddress.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/EmailAddress.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/EmailAddress.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/EmailAddress.java Sat Feb 4 13:47:46 2006
    @@ -1,19 +1,20 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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.
    */
    -package org.apache.myfaces.tobago.example.addressbook;

    public class EmailAddress {


    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDAO.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDAO.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDAO.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/InMemoryAddressDAO.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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 29.11.2004 17:36:20.
    * $Id: Controller.java,v 1.2 2005/08/10 11:57:55 lofwyr Exp $
    */
    -package org.apache.myfaces.tobago.example.addressbook;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/XStreamAddressDAO.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/XStreamAddressDAO.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/XStreamAddressDAO.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/java/org/apache/myfaces/tobago/example/addressbook/XStreamAddressDAO.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.addressbook;
    +
    /*
    * 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 29.11.2004 17:36:20.
    * $Id: Controller.java,v 1.2 2005/08/10 11:57:55 lofwyr Exp $
    */
    -package org.apache.myfaces.tobago.example.addressbook;

    import com.thoughtworks.xstream.XStream;
    import com.thoughtworks.xstream.io.xml.DomDriver;
    @@ -86,7 +88,7 @@
    return new ArrayList<Address>();
    }
    fr = new FileReader(storageFileName);
    - return (List<Address>)xstream.fromXML(fr);
    + return (List<Address>) xstream.fromXML(fr);
    } catch(Exception e) {
    throw new AddressDAOException("error loading addresses", e);
    } finally{

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Sat Feb 4 13:47:46 2006
    @@ -1,22 +1,24 @@
    +package org.apache.myfaces.tobago.example.demo;
    +
    /*
    * 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.
    */
    +
    /*
    * $Id: TobagoDemoController.java 1270 2005-08-08 20:21:38 +0200 (Mo, 08 Aug 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -45,12 +47,8 @@

    public class TobagoDemoController {

    -// ///////////////////////////////////////////// constant
    -
    private static final Log LOG = LogFactory.getLog(TobagoDemoController.class);

    -// ///////////////////////////////////////////// attribute
    -
    private String[] salutation;

    private SelectItem[] salutationItems;
    @@ -109,7 +107,6 @@

    private SelectItem[] toolbarTextItems;

    -// ///////////////////////////////////////////// constructor

    public TobagoDemoController() {

    @@ -121,7 +118,7 @@
    };

    salutationItems = getSelectItems(salutationKeys, "demo");
    - this.salutation = new String[]{"" ,"" ,"" ,""};
    + this.salutation = new String[]{"", "", "", ""};

    bool = new Boolean[10];
    bool[0] = true;
    @@ -149,11 +146,10 @@
    text[9] = "longer Text abcdefg hijklmnop";
    text[10]
    = "**strong text**\n\n__emphasis__\n\nnormaler text\n\n__dieses "
    - +
    - "ist emphasis__\n\n**und nochmal strong**\n\n**__ strong und emphasis__**";
    + + "ist emphasis__\n\n**und nochmal strong**\n\n**__ strong und emphasis__**";
    solarArray = SolarObject.getArray();
    solarArrayColumns = createSolarArrayColumns();
    - solarArrayColumnLayout = "3*;3*;3*";
    + solarArrayColumnLayout = "3*; 3*; 3*";

    tree = new DefaultMutableTreeNode(
    new Node("Root Node", "root"));
    @@ -183,7 +179,10 @@
    selectionItems = getSelectItems(values, "demo");
    selectionType = (String) selectionItems[0].getValue();

    - showIcons = showJunctions = showRoot = showRootJunction = true;
    + showIcons = true;
    + showJunctions = true;
    + showRoot = true;
    + showRootJunction = true;

    solar = new Solar();

    @@ -230,8 +229,6 @@
    return items;
    }

    -// ///////////////////////////////////////////// code
    -
    public void updateTree() {

    }
    @@ -240,15 +237,11 @@
    return new Node(name, id);
    }

    -// /////////////////////////////////////////////// action for links and buttons
    -
    public String clickButton() {
    LOG.info("clickButton");
    return "display";
    }

    -// ///////////////////////////////////////////// bean getter + setter
    -
    public String getSelectable() {
    return multiselect ? "multi" : "none";
    }
    @@ -499,10 +492,6 @@
    public void setNull(Object o) {

    }
    -
    -// /////////////////////////////////////////////////////////////////////////
    -// /////////////////////////////////////////////////////////////////////////
    -// /////////////////////////////////////////////////////////////////////////

    public static class Node {


    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java Sat Feb 4 13:47:46 2006
    @@ -1,19 +1,20 @@
    +package org.apache.myfaces.tobago.example.demo.actionlistener;
    +
    /*
    * 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.example.demo.actionlistener;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/TreeEditor.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/TreeEditor.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/TreeEditor.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/TreeEditor.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.actionlistener;
    +
    /*
    * 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 27.05.2003 13:37:22.
    * $Id: TreeEditor.java 1270 2005-08-08 20:21:38 +0200 (Mo, 08 Aug 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.actionlistener;

    import org.apache.myfaces.tobago.context.ResourceManagerUtil;
    import org.apache.myfaces.tobago.event.DefaultTreeActionListener;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigController.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.clientConfig;
    +
    /*
    * 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 21.08.2002 at 18:00:22.
    * $Id: ClientConfigController.java 1271 2005-08-08 20:44:11 +0200 (Mo, 08 Aug 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.clientConfig;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigPhaseListener.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigPhaseListener.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigPhaseListener.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ClientConfigPhaseListener.java Sat Feb 4 13:47:46 2006
    @@ -1,19 +1,20 @@
    +package org.apache.myfaces.tobago.example.demo.clientConfig;
    +
    /*
    * 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.example.demo.clientConfig;

    import javax.faces.context.FacesContext;
    import javax.faces.event.PhaseEvent;
    @@ -27,7 +28,7 @@
    */
    public class ClientConfigPhaseListener implements PhaseListener {

    - public static String[] BEAN_NAMES
    + public static final String[] BEAN_NAMES
    = {"clientConfigController", "clientConfigController2"};

    public void afterPhase(PhaseEvent event) {

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/clientConfig/ThemeConfigViewController.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.clientConfig;
    +
    /*
    * 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 13.07.2004 at 10:48:28.
    * $Id: ThemeConfigViewController.java 1271 2005-08-08 20:44:11 +0200 (Mo, 08 Aug 2005) lofwyr $
    */
    -package org.apache.myfaces.tobago.example.demo.clientConfig;

    import org.apache.commons.collections.KeyValue;
    import org.apache.commons.collections.keyvalue.DefaultKeyValue;
    @@ -46,7 +48,6 @@

    public class ThemeConfigViewController {

    -// ///////////////////////////////////////////// constant

    private static final Log LOG = LogFactory.getLog(ThemeConfigViewController.class);

    @@ -105,8 +106,6 @@
    "Verbatim"
    };

    -// ///////////////////////////////////////////// attribute
    -
    private String[] propertyNames;

    private KeyValue[] entrys;
    @@ -121,15 +120,11 @@

    private UIComponent component;

    -// ///////////////////////////////////////////// constructor
    -
    public ThemeConfigViewController() {
    component = new UIInput();
    init();
    }

    -// ///////////////////////////////////////////// code
    -
    private void init() {
    String[] themes;
    if (themeNames != null) {
    @@ -139,7 +134,7 @@
    }

    final Set<String> names = new HashSet<String>();
    - for (int j = 0; j < DEFAULT_THEMES.length ; j++) {
    + for (int j = 0; j < DEFAULT_THEMES.length; j++) {
    Properties properties = new Properties();
    String file = PROPERTY_FILE_PREFIX + themes[j] + PROPERTY_FILE_POSTFIX;
    InputStream inputStream = null;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/AbstractConverter.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.jsp;
    +
    /*
    * 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 on: 02.09.2002, 23:33:19
    * $Id: AbstractConverter.java,v 1.1.1.1 2004/04/15 18:41:00 idus Exp $
    */
    -package org.apache.myfaces.tobago.example.demo.jsp;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -31,22 +33,30 @@

    public abstract class AbstractConverter implements Converter {

    - private static final Log log = LogFactory.getLog(AbstractConverter.class);
    + private static final Log LOG = LogFactory.getLog(AbstractConverter.class);

    private Pattern pattern;

    - protected Perl5Matcher matcher = new Perl5Matcher();
    - protected Perl5Compiler compiler = new Perl5Compiler();
    - protected Perl5Util util = new Perl5Util();
    + private Perl5Matcher matcher = new Perl5Matcher();
    + private Perl5Compiler compiler = new Perl5Compiler();
    + private Perl5Util util = new Perl5Util();

    public abstract Pattern initPattern() throws MalformedPatternException;

    + public Perl5Compiler getCompiler() {
    + return compiler;
    + }
    +
    + public Perl5Util getUtil() {
    + return util;
    + }
    +
    public Pattern getPattern() {
    if (pattern == null) {
    try {
    pattern = initPattern();
    } catch (MalformedPatternException e) {
    - log.error("", e);
    + LOG.error("", e);
    }
    }
    return pattern;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/Converter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/Converter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/Converter.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/Converter.java Sat Feb 4 13:47:46 2006
    @@ -1,29 +1,32 @@
    +package org.apache.myfaces.tobago.example.demo.jsp;
    +
    /*
    * 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 on: 02.09.2002, 23:26:31
    * $Id: Converter.java,v 1.1.1.1 2004/04/15 18:41:00 idus Exp $
    */
    -package org.apache.myfaces.tobago.example.demo.jsp;

    public interface Converter {

    - public String convertMisc(String fragment);
    - public String convertMatch(String fragment);
    + String convertMisc(String fragment);
    +
    + String convertMatch(String fragment);

    - public String convert(String fragment);
    + String convert(String fragment);

    }

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.jsp;
    +
    /*
    * 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 on: 02.09.2002, 22:11:52
    * $Id: JspFormatter.java,v 1.1.1.1 2004/04/15 18:41:00 idus Exp $
    */
    -package org.apache.myfaces.tobago.example.demo.jsp;

    import javax.servlet.jsp.JspWriter;
    import java.io.FileNotFoundException;

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspTagConverter.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.jsp;
    +
    /*
    * 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 on: 02.09.2002, 23:37:54
    * $Id: JspTagConverter.java,v 1.1.1.1 2004/04/15 18:41:00 idus Exp $
    */
    -package org.apache.myfaces.tobago.example.demo.jsp;

    import org.apache.commons.logging.Log;
    import org.apache.commons.logging.LogFactory;
    @@ -30,28 +32,28 @@

    public class JspTagConverter extends AbstractConverter {

    - private static final Log log = LogFactory.getLog(JspTagConverter.class);
    + private static final Log LOG = LogFactory.getLog(JspTagConverter.class);

    private TagConverter tagConverter = new TagConverter();
    - private Map<String,String> tags = new HashMap<String, String>();
    + private Map<String, String> tags = new HashMap<String, String>();

    public Pattern initPattern() throws MalformedPatternException {
    // return compiler.compile("(?s)<%.*?%>");
    // return compiler.compile("(?s)<%(--)?.*?\\1%>");
    - return compiler.compile("(?s)(<%--.*?--%>)|(<%.*?%>)");
    + return getCompiler().compile("(?s)(<%--.*?--%>)|(<%.*?%>)");
    }

    public String highlightJavaKeyword(String java) {
    - return util.substitute("s/(\\bassert\\b|break\\b|\\bbyte\\b|\\bboolean\\b" +
    - "|\\bcatch\\b|\\bcase\\b|\\bchar\\b|\\bcontinue\\b|\\bdouble\\b" +
    - "|\\bdo\\b|\\belse\\b|\\bextends\\b|\\bfalse\\b|\\bfinal\\b" +
    - "|\\bfloat\\b|\\bfor\\b|\\bfinally\\b|\\bif\\b|\\bimplements\\b" +
    - "|\\bint\\b|\\binterface\\b|\\binstanceof\\b|\\blong\\b|\\blength\\b" +
    - "|\\bnew\\b|\\bnull\\b|\\bprivate\\b|\\bprotected\\b|\\bpublic\\b" +
    - "|\\breturn\\b|\\bswitch\\b|\\bsynchronized\\b|\\bshort\\b" +
    - "|\\bstatic\\b|\\bsuper\\b|\\btry\\b|\\btrue\\b|\\bthis\\b" +
    - "|\\bthrow\\b|\\bthrows\\b|\\bvoid\\b|\\bwhile\\b)" +
    - "/<span class=\"keyword\">$1<\\/span>/g", java);
    + return getUtil().substitute("s/(\\bassert\\b|break\\b|\\bbyte\\b|\\bboolean\\b"
    + + "|\\bcatch\\b|\\bcase\\b|\\bchar\\b|\\bcontinue\\b|\\bdouble\\b"
    + + "|\\bdo\\b|\\belse\\b|\\bextends\\b|\\bfalse\\b|\\bfinal\\b"
    + + "|\\bfloat\\b|\\bfor\\b|\\bfinally\\b|\\bif\\b|\\bimplements\\b"
    + + "|\\bint\\b|\\binterface\\b|\\binstanceof\\b|\\blong\\b|\\blength\\b"
    + + "|\\bnew\\b|\\bnull\\b|\\bprivate\\b|\\bprotected\\b|\\bpublic\\b"
    + + "|\\breturn\\b|\\bswitch\\b|\\bsynchronized\\b|\\bshort\\b"
    + + "|\\bstatic\\b|\\bsuper\\b|\\btry\\b|\\btrue\\b|\\bthis\\b"
    + + "|\\bthrow\\b|\\bthrows\\b|\\bvoid\\b|\\bwhile\\b)"
    + + "/<span class=\"keyword\">$1<\\/span>/g", java);
    }

    public String convertMatch(String fragment) {
    @@ -75,14 +77,14 @@
    tag = highlightJavaKeyword(tag);
    tag = "<span class=\"jsp-tag\">" + tag + "</span>";
    } else {
    - log.error("error: " + fragment);
    + LOG.error("error: " + fragment);
    }
    tags.put(key, tag);
    return "${" + key + "}";
    }

    public String convert(String input) {
    - String result;// = StringUtils.replace(input, "$", "$$");
    + String result; // = StringUtils.replace(input, "$", "$$");
    result = super.convert(input);
    result = tagConverter.convert(result);
    StringExpression stringExpression = new StringExpression(result);

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/StringExpression.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.jsp;
    +
    /*
    * 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 on: Apr 10, 2002, 11:04:12 PM
    * $Id: StringExpression.java,v 1.1.1.1 2004/04/15 18:40:59 idus Exp $
    */
    -package org.apache.myfaces.tobago.example.demo.jsp;


    import org.apache.commons.logging.Log;
    @@ -46,13 +48,13 @@
    return string;
    }

    - public String substitute(Map<String,String> variables) {
    + public String substitute(Map<String, String> variables) {
    return replaceVariables(string, variables);
    }

    // implementation copied from ant.ProjectHelper
    private static String replaceVariables(
    - String stringExpression, Map<String,String> variables) {
    + String stringExpression, Map<String, String> variables) {
    if (stringExpression == null) {
    return null;
    }
    @@ -112,7 +114,7 @@
    }

    public static void main(String[] args) {
    - Map<String,String> env = new HashMap<String, String>();
    + Map<String, String> env = new HashMap<String, String>();
    env.put("v1", "var1");
    env.put("v2", "var2");
    String expression = "bla${v1}blup${v2}";

    Modified: incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/TagConverter.java
    URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/TagConverter.java?rev=374936&r1=374935&r2=374936&view=diff
    ==============================================================================
    --- incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/TagConverter.java (original)
    +++ incubator/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/TagConverter.java Sat Feb 4 13:47:46 2006
    @@ -1,23 +1,25 @@
    +package org.apache.myfaces.tobago.example.demo.jsp;
    +
    /*
    * 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 on: 02.09.2002, 23:40:26
    * $Id: TagConverter.java,v 1.1.1.1 2004/04/15 18:41:00 idus Exp $
    */
    -package org.apache.myfaces.tobago.example.demo.jsp;

    import org.apache.oro.text.regex.MalformedPatternException;
    import org.apache.oro.text.regex.Pattern;
    @@ -25,17 +27,16 @@
    public class TagConverter extends AbstractConverter {

    public Pattern initPattern() throws MalformedPatternException {
    - return compiler.compile("(?s)<.*?>");
    + return getCompiler().compile("(?s)<.*?>");
    }

    public String convertMatch(String fragment) {
    // String escaped = XmlUtils.escape(fragment);

    - String withLinks = util.substitute(
    - "s/^<jsp:include page=\\\"([\\-\\.\\/\\w]+)" +
    - "/<jsp:include page=\\\"<a href='viewSource.jsp?jsp=$1'>$1<\\/a>/", fragment);
    + String withLinks = getUtil().substitute("s/^<jsp:include page=\\\"([\\-\\.\\/\\w]+)"
    + + "/<jsp:include page=\\\"<a href='viewSource.jsp?jsp=$1'>$1<\\/a>/", fragment);

    - String escaped = util.substitute("s/^(<\\/?)(\\w+):/$1<b>$2<\\/b>:/", withLinks);
    + String escaped = getUtil().substitute("s/^(<\\/?)(\\w+):/$1<b>$2<\\/b>:/", withLinks);
    escaped = highlightStrings(escaped);
    return "<span class=\"html-tag\">&lt;" + escaped.substring(1, escaped.length()-1) + "></span>";
    }

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupcommits @
categoriesmyfaces
postedFeb 4, '06 at 9:54p
activeFeb 4, '06 at 9:54p
posts5
users1
websitemyfaces.apache.org

1 user in discussion

Bommel: 5 posts

People

Translate

site design / logo © 2019 Grokbase