You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/02/04 22:52:21 UTC
svn commit: r374936 [9/14] - in /incubator/tobago/trunk: tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/api/
tobago-core/src/main/java/org/apache/myfaces/tobago/application/ to...
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsPassword.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsPassword.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsPassword.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsPassword.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.decl;
+
/*
* 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.taglib.decl;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
@@ -30,6 +31,6 @@
* password field , so you will not see the typed charakters.
*/
@TagAttribute
- @UIComponentTagAttribute(type="java.lang.Boolean", defaultValue = "false")
+ @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "false")
void setPassword(String password);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsReadonly.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsReadonly.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsReadonly.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsReadonly.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.decl;
+
/*
* 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.taglib.decl;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
@@ -27,6 +28,6 @@
/**
* Flag indicating that this component will prohibit changes by the user.
*/
- @TagAttribute @UIComponentTagAttribute(type="java.lang.Boolean")
+ @TagAttribute @UIComponentTagAttribute(type = "java.lang.Boolean")
void setReadonly(String readonly);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRendered.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRendered.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRendered.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRendered.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.decl;
+
/*
* 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.taglib.decl;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
@@ -26,6 +27,6 @@
* Flag indicating whether or not this component should be rendered
* (during Render Response Phase), or processed on any subsequent form submit.
*/
- @TagAttribute @UIComponentTagAttribute(type="java.lang.Boolean", defaultValue="true")
+ @TagAttribute @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "true")
void setRendered(String rendered);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRequired.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRequired.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRequired.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/decl/IsRequired.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.decl;
+
/*
* 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.taglib.decl;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.DateTag;
@@ -42,7 +43,7 @@
/**
* Renders a date input field.
*/
-@Tag(name="date")
+@Tag(name = "date")
public class DateExtensionTag extends BodyTagSupport
implements HasValue, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.FileTag;
@@ -25,7 +26,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-@Tag(name="file")
+@Tag(name = "file")
public class FileExtensionTag extends BodyTagSupport
implements InputTagDeclaration, HasIdBindingAndRendered, IsDisabled,
HasTip, HasLabel {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.InTag;
@@ -31,7 +32,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-@Tag(name="in")
+@Tag(name = "in")
public class InExtensionTag extends BodyTagSupport
implements HasValue, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.GridLayoutTag;
@@ -26,7 +27,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-@Tag(name="label")
+@Tag(name = "label")
public class LabelExtensionTag extends BodyTagSupport
implements HasValue, HasTip {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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: Aug 13, 2002 3:04:03 PM
- * $Id: SelectOneChoiceTag.java 347824 2005-11-01 21:03:54Z bommel $
- */
-package org.apache.myfaces.tobago.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.SelectManyListboxTag;
@@ -43,7 +40,7 @@
* Time: 19:12:33
* To change this template use File | Settings | File Templates.
*/
-@Tag(name="selectManyListbox")
+@Tag(name = "selectManyListbox")
public class SelectManyListboxExtensionTag extends BodyTagSupport
implements HasId, HasValue, IsDisabled, HasHeight, IsInline,
HasLabel, //HasLabelAndAccessKey,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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: Aug 13, 2002 3:04:03 PM
- * $Id: SelectOneChoiceTag.java 347824 2005-11-01 21:03:54Z bommel $
- */
-package org.apache.myfaces.tobago.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.SelectOneChoiceTag;
@@ -37,7 +34,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-@Tag(name="selectOneChoice")
+@Tag(name = "selectOneChoice")
public class SelectOneChoiceExtensionTag
extends BodyTagSupport
implements HasId, HasValue, IsDisabled,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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: Aug 13, 2002 3:04:03 PM
- * $Id: SelectOneChoiceTag.java 347824 2005-11-01 21:03:54Z bommel $
- */
-package org.apache.myfaces.tobago.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.SelectOneListboxTag;
@@ -48,7 +45,7 @@
/**
* Render a single selection option listbox.
*/
-@Tag(name="selectOneListbox")
+@Tag(name = "selectOneListbox")
public class SelectOneListboxExtensionTag
extends BodyTagSupport implements HasId, HasValue, IsDisabled,
HasLabel, // HasLabelAndAccessKey,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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.taglib.extension;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.TextAreaTag;
@@ -30,7 +31,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-@Tag(name="textarea")
+@Tag(name = "textarea")
public class TextAreaExtensionTag extends BodyTagSupport
implements HasValue, HasIdBindingAndRendered,
HasConverter, HasValidator, IsReadonly, IsDisabled,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java Sat Feb 4 13:47:46 2006
@@ -1,21 +1,21 @@
+package org.apache.myfaces.tobago.taglib.extension;
+
/*
* 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.taglib.extension;
-
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.TimeTag;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
@@ -43,7 +43,7 @@
/**
* Renders a time input field.
*/
-@Tag(name="time")
+@Tag(name = "time")
public class TimeExtensionTag extends BodyTagSupport
implements HasValue, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/package-info.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/package-info.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/package-info.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/taglib/extension/package-info.java Sat Feb 4 13:47:46 2006
@@ -1,18 +1,19 @@
/*
* 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.
*/
+
/**
* <h2><Tobago Framework Extension Tag Library -
* (C) Copyright 2002-2005 The Apache Software Foundation</h2>
@@ -20,5 +21,5 @@
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tx",
uri = "http://myfaces.apache.org/tobago/extension",
- fileName= "tobago-extension.tld", displayName = "Tobago Extensions")
-package org.apache.myfaces.tobago.taglib.extension;
\ No newline at end of file
+ fileName = "tobago-extension.tld", displayName = "Tobago Extensions")
+package org.apache.myfaces.tobago.taglib.extension;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/tool/BuilderModel.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/tool/BuilderModel.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/tool/BuilderModel.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/tool/BuilderModel.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.tool;
+
/*
* 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 10.10.2003 08:47: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.tool;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -32,22 +29,11 @@
public class BuilderModel {
-// /////////////////////////////////////////// constants
-
private static final Log LOG = LogFactory.getLog(BuilderModel.class);
-// /////////////////////////////////////////// attributes
-
private String page = "builder/index.jsp";
private String source;
-// /////////////////////////////////////////// constructors
-
-// /////////////////////////////////////////// code
-
-// /////////////////////////////////////////// utils
-
-// /////////////////////////////////////////// bean getter + setter
public String getPage() {
return page;
@@ -65,59 +51,55 @@
this.source = source;
}
-// /////////////////////////////////////////// actions
+ public String open() {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("invoke!!!");
+ }
- public String open() {
- if (LOG.isDebugEnabled()) {
- LOG.debug("invoke!!!");
- }
+ return "enterPagename";
+ }
- return "enterPagename";
+ public String loadPage() {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("invoke!!!");
}
- public String loadPage() {
- if (LOG.isDebugEnabled()) {
- LOG.debug("invoke!!!");
- }
-
- FacesContext facesContext = FacesContext.getCurrentInstance();
-
- InputStream stream = null;
- try {
- stream = facesContext.getExternalContext().getResourceAsStream(page);
- source = IOUtils.toString(stream);
- } catch (IOException e) {
- LOG.error("", e);
- return "error"; // TODO: error message
- } finally {
- IOUtils.closeQuietly(stream);
- }
+ FacesContext facesContext = FacesContext.getCurrentInstance();
- return "viewSource";
+ InputStream stream = null;
+ try {
+ stream = facesContext.getExternalContext().getResourceAsStream(page);
+ source = IOUtils.toString(stream);
+ } catch (IOException e) {
+ LOG.error("", e);
+ return "error"; // TODO: error message
+ } finally {
+ IOUtils.closeQuietly(stream);
}
- public String savePage() {
- if (LOG.isDebugEnabled()) {
- LOG.debug("invoke!!!");
- }
-
- FacesContext facesContext = FacesContext.getCurrentInstance();
- // TODO ServletContext ???
- ServletContext servletContext =
- (ServletContext) facesContext.getExternalContext().getContext();
-
- String realPath = servletContext.getRealPath(page);
- try {
- // TODO: use IOUtils.write when commons-io 1.1 is released
- FileUtils.writeStringToFile(new File(realPath), source, System.getProperty("file.encoding"));
- } catch (IOException e) {
- LOG.error("", e);
- return "error"; // TODO: error message
- }
+ return "viewSource";
+ }
+
+ public String savePage() {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("invoke!!!");
+ }
- return "viewSource";
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ // TODO ServletContext ???
+ ServletContext servletContext =
+ (ServletContext) facesContext.getExternalContext().getContext();
+
+ String realPath = servletContext.getRealPath(page);
+ try {
+ // TODO: use IOUtils.write when commons-io 1.1 is released
+ FileUtils.writeStringToFile(new File(realPath), source, System.getProperty("file.encoding"));
+ } catch (IOException e) {
+ LOG.error("", e);
+ return "error"; // TODO: error message
}
-// /////////////////////////////////////////// action getter
+ return "viewSource";
+ }
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/AccessKeyMap.java Sat Feb 4 13:47:46 2006
@@ -1,24 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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.
- */
-/**
- * User: weber
- * Date: Apr 5, 2005
- * Time: 3:23:40 PM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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.util;
import javax.faces.context.FacesContext;
import java.util.HashSet;
@@ -30,21 +26,22 @@
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
- private final static String request_map_key = "accessKeysRequestMapKey";
+ private static final String REQUEST_MAP_KEY = "accessKeysRequestMapKey";
+
+ private HashSet set;
+ private String dublicated = "";
+
public static AccessKeyMap getInstance(FacesContext facesContext) {
final Map requestMap = facesContext.getExternalContext().getRequestMap();
- AccessKeyMap keyMap = (AccessKeyMap) requestMap.get(request_map_key);
+ AccessKeyMap keyMap = (AccessKeyMap) requestMap.get(REQUEST_MAP_KEY);
if (keyMap == null) {
keyMap = new AccessKeyMap();
- requestMap.put(request_map_key, keyMap);
+ requestMap.put(REQUEST_MAP_KEY, keyMap);
}
return keyMap;
}
- private HashSet set;
- private String dublicated = "";
-
private AccessKeyMap() {
set = new HashSet();
}
@@ -82,7 +79,7 @@
HashSet set = getInstance(facesContext).getSet();
StringBuffer sb = new StringBuffer();
for (int i = 0; i < KEYS.length; i++) {
- if (! set.contains(new Character(KEYS[i]))) {
+ if (!set.contains(new Character(KEYS[i]))) {
sb.append(KEYS[i]);
}
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/BeanComparator.java Sat Feb 4 13:47:46 2006
@@ -1,22 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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.
- */
-/*
- * $Id: BeanComparator.java,v 1.6 2004/05/19 14:57:13 lofwyr Exp $
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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.util;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
@@ -41,7 +39,7 @@
private boolean reverse;
- public BeanComparator (String property){
+ public BeanComparator(String property) {
this.property = property;
}
@@ -68,8 +66,8 @@
*/
public boolean equals(Object param1) {
if (param1 instanceof BeanComparator) {
- return ((BeanComparator)param1).getProperty().equals(property)
- && ((BeanComparator)param1).getComparator().equals(comparator);
+ return ((BeanComparator) param1).getProperty().equals(property)
+ && ((BeanComparator) param1).getComparator().equals(comparator);
}
return false;
}
@@ -112,9 +110,9 @@
}
}
- if (! obj1.getClass().isInstance(obj2)) {
- throw new ClassCastException(obj1.getClass().getName() + " != " +
- obj2.getClass().getName());
+ if (!obj1.getClass().isInstance(obj2)) {
+ throw new ClassCastException(obj1.getClass().getName() + " != "
+ + obj2.getClass().getName());
}
int result;
@@ -122,25 +120,22 @@
if (comparator instanceof Collator) {
CollationKey collationKey1
- = ((Collator)comparator).getCollationKey(obj1.toString());
+ = ((Collator) comparator).getCollationKey(obj1.toString());
CollationKey collationKey2
- = ((Collator)comparator).getCollationKey(obj2.toString());
+ = ((Collator) comparator).getCollationKey(obj2.toString());
result = collationKey1.compareTo(collationKey2);
} else if (comparator != null) {
result = comparator.compare(obj1, obj2);
} else {
if (obj1 instanceof Comparable) {
- result = ((Comparable)obj1).compareTo(obj2);
- }
- else {
+ result = ((Comparable) obj1).compareTo(obj2);
+ } else {
result = obj1.toString().compareTo(obj2.toString());
}
}
return reverse ? -result : result;
}
-
- // ----------------------------------------------------------- getter + setter
public String getProperty() {
return this.property;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CommonsLoggingLogger.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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 24.11.2004 21:56:42.
- * $Id: CommonsLoggingLogger.java,v 1.1 2005/06/20 07:41:21 lofwyr Exp $
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this 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.util;
import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.logging.Log;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/DebugPhaseListener.java Sat Feb 4 13:47:46 2006
@@ -1,20 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtil.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtil.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtil.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/HtmlWriterUtil.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -55,7 +56,7 @@
public void writeAttributeValue(final char[] text)
throws IOException {
- writeEncodedValue(text, 0, text.length, true);
+ writeEncodedValue(text, 0, text.length, true);
}
public void writeAttributeValue(
@@ -65,9 +66,6 @@
}
-
-
-
public void writeText(final String text) throws IOException {
writeText(text.toCharArray(), 0, text.length());
}
@@ -93,10 +91,8 @@
// }
-
-
private void writeEncodedValue(final char[] text, final int start,
- final int length, final boolean isAttribute)
+ final int length, final boolean isAttribute)
throws IOException {
// final char[][] charsToEscape;
@@ -120,16 +116,16 @@
}
if (localIndex == -1) {
- // no need to escape
+ // no need to escape
out.write(text, start, length);
} else {
- // write until localIndex and then encode the remainder
+ // write until localIndex and then encode the remainder
out.write(text, start, localIndex);
for (int i = localIndex; i < end; i++) {
final char ch = text[i];
- // Tilde or less...
+ // Tilde or less...
if (ch < charsToEscape.length - 1) {
if (isAttribute && ch == '&' && (i + 1 < end) && text[i + 1] == '{') {
// HTML 4.0, section B.7.1: ampersands followed by
@@ -151,7 +147,7 @@
out.write('&');
// FIXME? write(String) sets the startStillOpen=false
// out.write(sISO8859_1_Entities[ch - 0xA0]);
- for (char c : sISO8859_1_Entities[ch - 0xA0].toCharArray()) {
+ for (char c : ISO8859_1_ENTITIES[ch - 0xA0].toCharArray()) {
out.write(c);
}
out.write(';');
@@ -162,7 +158,7 @@
// PENDING: when outputting to an encoding that
// supports double-byte characters (UTF-8, for example),
// we should not be encoding
- _writeDecRef(ch);
+ writeDecRef(ch);
}
}
@@ -176,43 +172,43 @@
* the decimal version, but Netscape didn't support hex escapes until
* 4.7.4.
*/
- private void _writeDecRef(final char ch) throws IOException {
- if (ch == '\u20ac') {
- out.write("€");
- return;
- }
- out.write("&#");
- // Formerly used String.valueOf(). This version tests out
- // about 40% faster in a microbenchmark (and on systems where GC is
- // going gonzo, it should be even better)
- int i = (int) ch;
- if (i > 10000) {
- out.write('0' + (i / 10000));
- i = i % 10000;
- out.write('0' + (i / 1000));
- i = i % 1000;
- out.write('0' + (i / 100));
- i = i % 100;
- out.write('0' + (i / 10));
- i = i % 10;
- out.write('0' + i);
- } else if (i > 1000) {
- out.write('0' + (i / 1000));
- i = i % 1000;
- out.write('0' + (i / 100));
- i = i % 100;
- out.write('0' + (i / 10));
- i = i % 10;
- out.write('0' + i);
- } else {
- out.write('0' + (i / 100));
- i = i % 100;
- out.write('0' + (i / 10));
- i = i % 10;
- out.write('0' + i);
- }
+ private void writeDecRef(final char ch) throws IOException {
+ if (ch == '\u20ac') {
+ out.write("€");
+ return;
+ }
+ out.write("&#");
+ // Formerly used String.valueOf(). This version tests out
+ // about 40% faster in a microbenchmark (and on systems where GC is
+ // going gonzo, it should be even better)
+ int i = (int) ch;
+ if (i > 10000) {
+ out.write('0' + (i / 10000));
+ i = i % 10000;
+ out.write('0' + (i / 1000));
+ i = i % 1000;
+ out.write('0' + (i / 100));
+ i = i % 100;
+ out.write('0' + (i / 10));
+ i = i % 10;
+ out.write('0' + i);
+ } else if (i > 1000) {
+ out.write('0' + (i / 1000));
+ i = i % 1000;
+ out.write('0' + (i / 100));
+ i = i % 100;
+ out.write('0' + (i / 10));
+ i = i % 10;
+ out.write('0' + i);
+ } else {
+ out.write('0' + (i / 100));
+ i = i % 100;
+ out.write('0' + (i / 10));
+ i = i % 10;
+ out.write('0' + i);
+ }
- out.write(';');
+ out.write(';');
}
//
@@ -231,14 +227,14 @@
* full, and returning the new buffer index
*/
private void addToBuffer(final char ch) throws IOException {
- if (bufferIndex >= BUFFER_SIZE) {
- out.write(buff, 0, bufferIndex);
- bufferIndex = 0;
- }
+ if (bufferIndex >= BUFFER_SIZE) {
+ out.write(buff, 0, bufferIndex);
+ bufferIndex = 0;
+ }
- buff[bufferIndex] = ch;
+ buff[bufferIndex] = ch;
- bufferIndex += 1;
+ bufferIndex += 1;
}
@@ -247,10 +243,10 @@
* and return the reset buffer index
*/
private void flushBuffer() throws IOException {
- if (bufferIndex > 0) {
- out.write(buff, 0, bufferIndex);
- }
- bufferIndex = 0;
+ if (bufferIndex > 0) {
+ out.write(buff, 0, bufferIndex);
+ }
+ bufferIndex = 0;
}
public static boolean attributeValueMustEscaped(final String name) {
@@ -277,18 +273,19 @@
return false;
}
break;
+ default:
+ return true;
}
- } catch (Exception e) { /* ignore */ }
-// if ("id".equals(name) || "name".equals(name) || "class".equals(name)) {
-// return false;
-// }
+ } catch (Exception e) {
+ /* ignore */
+ }
return true;
}
//
// Entities from HTML 4.0, section 24.2.1; character codes 0xA0 to 0xFF
//
- static private final String[] sISO8859_1_Entities = new String[]{
+ private static final String[] ISO8859_1_ENTITIES = new String[]{
"nbsp",
"iexcl",
"cent",
@@ -387,9 +384,9 @@
"yuml"
};
- private static char[][] ATTRIBUTE_CHARS_TO_ESCAPE;
+ private static final char[][] ATTRIBUTE_CHARS_TO_ESCAPE;
- private static char[][] TEXT_CHARS_TO_ESCAPE;
+ private static final char[][] TEXT_CHARS_TO_ESCAPE;
static {
// init lookup arrays
@@ -401,7 +398,7 @@
ATTRIBUTE_CHARS_TO_ESCAPE[0x3E] = ">".toCharArray(); // 0x3E '>'
TEXT_CHARS_TO_ESCAPE = new char[ATTRIBUTE_CHARS_TO_ESCAPE.length][];
- for (int i = 0 ; i < ATTRIBUTE_CHARS_TO_ESCAPE.length; i++) {
+ for (int i = 0; i < ATTRIBUTE_CHARS_TO_ESCAPE.length; i++) {
TEXT_CHARS_TO_ESCAPE[i] = ATTRIBUTE_CHARS_TO_ESCAPE[i];
}
TEXT_CHARS_TO_ESCAPE[0x3C] = "<".toCharArray(); // 0x '<'
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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 10.11.2003 at 13:23:46.
- * $Id$
- */
-package org.apache.myfaces.tobago.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -49,7 +46,7 @@
if (layoutTokens.length == cellCount) {
this.layoutTokens = layoutTokens;
} else if (layoutTokens.length > cellCount) {
- if (! ignoreMismatch && LOG.isWarnEnabled()) {
+ if (!ignoreMismatch && LOG.isWarnEnabled()) {
LOG.warn("More tokens (" + layoutTokens.length
+ ") for layout than cells (" + cellCount + ") found! Ignoring"
+ " redundant tokens. Token string was: "
@@ -60,10 +57,10 @@
this.layoutTokens[i] = layoutTokens[i];
}
} else {
- if (! ignoreMismatch && LOG.isWarnEnabled()) {
+ if (!ignoreMismatch && LOG.isWarnEnabled()) {
LOG.warn(Integer.toString(cellCount - layoutTokens.length)
- + "More cells ("+cellCount+") than tokens ("+layoutTokens.length
- +") for layout found! Setting missing tokens to '1*'."
+ + "More cells (" + cellCount + ") than tokens (" + layoutTokens.length
+ + ") for layout found! Setting missing tokens to '1*'."
+ " Token string was: " + tokensToString(layoutTokens));
}
this.layoutTokens = new String[cellCount];
@@ -233,7 +230,7 @@
addSpace(1, i);
}
}
- if (! found) {
+ if (!found) {
break;
}
}
@@ -245,11 +242,11 @@
LOG.debug("spaces after spread :" + arrayAsString(spaces));
}
}
-
- private String arrayAsString(int[] spaces) {
+ //TODO replace with Arrays.asList ..
+ private String arrayAsString(int[] currentSpaces) {
StringBuffer sb = new StringBuffer("[");
- for (int i = 0; i < spaces.length; i++) {
- sb.append(spaces[i]);
+ for (int i = 0; i < currentSpaces.length; i++) {
+ sb.append(currentSpaces[i]);
sb.append(", ");
}
sb.replace(sb.lastIndexOf(", "), sb.length(), "]");
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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 01.07.2003 at 17:52:10.
- * $Id$
- */
-package org.apache.myfaces.tobago.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -198,7 +195,7 @@
} else if (!ComponentUtil.getBooleanAttribute(component, ATTR_INLINE)) {
value = ComponentUtil.getAttribute(component, layoutAttribute);
- return (Integer) value ;
+ return (Integer) value;
}
return null;
}
@@ -253,7 +250,7 @@
cell.getAttributes().put(attribute, value);
if (ATTR_LAYOUT_WIDTH.equals(attribute)) {
cell.getAttributes().remove(ATTR_INNER_WIDTH);
- } else if (ATTR_LAYOUT_HEIGHT.equals(attribute)){
+ } else if (ATTR_LAYOUT_HEIGHT.equals(attribute)) {
cell.getAttributes().remove(ATTR_INNER_HEIGHT);
}
if (cell instanceof UIPanel
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/LocaleUtil.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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 14.06.2005 13:45:11.
- * $Id: LocaleUtil.java,v 1.2 2005/06/15 15:24:42 lofwyr Exp $
- */
-package org.apache.myfaces.tobago.util;
import org.apache.commons.lang.StringUtils;
@@ -43,6 +40,8 @@
case 3:
locale = new Locale(strings[0], strings[1], strings[2]);
break;
+ default:
+ // TODO
}
return locale;
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/MessageFactory.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,10 +34,9 @@
*/
public class MessageFactory {
-
private static final Log LOG = LogFactory.getLog(MessageFactory.class);
- private static Map<Locale,ResourceBundle> facesMessagesMap
+ private static Map<Locale, ResourceBundle> facesMessagesMap
= new HashMap<Locale, ResourceBundle>();
public static FacesMessage createFacesMessage(FacesContext facesContext,
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RangeParser.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RangeParser.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RangeParser.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/RangeParser.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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 29.03.2004 at 14:58:11.
- * $Id$
- */
-package org.apache.myfaces.tobago.util;
+ * Created 29.03.2004 at 14:58:11.
+ * $Id$
+ */
import java.util.ArrayList;
import java.util.List;
@@ -33,17 +35,15 @@
int idx = token.indexOf('-');
if (idx == -1) {
indexList.add(token);
- }
- else {
+ } else {
int start = Integer.parseInt(token.substring(0, idx).trim());
int end = Integer.parseInt(token.substring(idx + 1).trim());
if (start < end) {
for (int i = start; i < end + 1; i++) {
indexList.add(Integer.toString(i));
}
- }
- else {
- for (int i = start; i > end -1; i--){
+ } else {
+ for (int i = start; i > end - 1; i--) {
indexList.add(Integer.toString(i));
}
}
@@ -56,5 +56,4 @@
}
return indices;
}
-
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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 17.03.2004 11:12:44.
- * $Id$
- */
-package org.apache.myfaces.tobago.util;
import java.util.ArrayList;
import java.util.List;
@@ -38,7 +35,7 @@
case 1:
return string.toUpperCase();
default:
- return string.substring(0,1).toUpperCase() + string.substring(1);
+ return string.substring(0, 1).toUpperCase() + string.substring(1);
}
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ValueBindingComparator.java Sat Feb 4 13:47:46 2006
@@ -1,5 +1,21 @@
package org.apache.myfaces.tobago.util;
+/*
+ * 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,21 +25,6 @@
import java.text.Collator;
import java.util.Comparator;
import java.util.Map;
-/*
- * 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: Mon Apr 15 15:56:44 2002
@@ -57,14 +58,16 @@
this.reverse = reverse;
}
- public ValueBindingComparator(FacesContext facesContext, String var, ValueBinding valueBinding, Comparator comparator) {
+ public ValueBindingComparator(FacesContext facesContext, String var,
+ ValueBinding valueBinding, Comparator comparator) {
this.facesContext = facesContext;
this.var = var;
this.valueBinding = valueBinding;
this.comparator = comparator;
}
- public ValueBindingComparator(FacesContext facesContext, String var, ValueBinding valueBinding, boolean reverse, Comparator comparator) {
+ public ValueBindingComparator(FacesContext facesContext, String var,
+ ValueBinding valueBinding, boolean reverse, Comparator comparator) {
this.facesContext = facesContext;
this.var = var;
this.valueBinding = valueBinding;
@@ -73,19 +76,30 @@
}
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
final ValueBindingComparator that = (ValueBindingComparator) o;
- if (reverse != that.reverse) return false;
- if (comparator != null ? !comparator.equals(that.comparator) : that.comparator != null)
+ if (reverse != that.reverse) {
return false;
- if (facesContext != null ? !facesContext.equals(that.facesContext) : that.facesContext != null)
+ }
+ if (comparator != null ? !comparator.equals(that.comparator) : that.comparator != null) {
return false;
- if (valueBinding != null ? !valueBinding.equals(that.valueBinding) : that.valueBinding != null)
+ }
+ if (facesContext != null ? !facesContext.equals(that.facesContext) : that.facesContext != null) {
return false;
- if (var != null ? !var.equals(that.var) : that.var != null) return false;
+ }
+ if (valueBinding != null ? !valueBinding.equals(that.valueBinding) : that.valueBinding != null) {
+ return false;
+ }
+ if (var != null ? !var.equals(that.var) : that.var != null) {
+ return false;
+ }
return true;
}
@@ -134,9 +148,9 @@
}
}
- if (! obj1.getClass().isInstance(obj2)) {
- throw new ClassCastException(obj1.getClass().getName() + " != " +
- obj2.getClass().getName());
+ if (!obj1.getClass().isInstance(obj2)) {
+ throw new ClassCastException(obj1.getClass().getName() + " != "
+ + obj2.getClass().getName());
}
int result;
@@ -144,24 +158,21 @@
if (comparator instanceof Collator) {
CollationKey collationKey1
- = ((Collator)comparator).getCollationKey(obj1.toString());
+ = ((Collator) comparator).getCollationKey(obj1.toString());
CollationKey collationKey2
- = ((Collator)comparator).getCollationKey(obj2.toString());
+ = ((Collator) comparator).getCollationKey(obj2.toString());
result = collationKey1.compareTo(collationKey2);
} else if (comparator != null) {
result = comparator.compare(obj1, obj2);
} else {
if (obj1 instanceof Comparable) {
- result = ((Comparable)obj1).compareTo(obj2);
- }
- else {
+ result = ((Comparable) obj1).compareTo(obj2);
+ } else {
result = obj1.toString().compareTo(obj2.toString());
}
}
return reverse ? -result : result;
}
- // ----------------------------------------------------------- getter + setter
-
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtil.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.util;
+
/*
* 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: 28.04.2004, 18:23:31
- * $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.util;
import javax.faces.application.Application;
import javax.faces.context.FacesContext;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/XmlUtils.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/XmlUtils.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/XmlUtils.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/XmlUtils.java Sat Feb 4 13:47:46 2006
@@ -1,26 +1,22 @@
package org.apache.myfaces.tobago.util;
+
/*
* 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.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class XmlUtils {
-
- private static final Log LOG = LogFactory.getLog(XmlUtils.class);
public static String escape(String s) {
return escape(s, true);
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/validator/ClearValidatorsActionListener.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.validator;
+
/*
* 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 22.10.2003 16:57:20.
* $Id$
*/
-package org.apache.myfaces.tobago.validator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,17 +35,9 @@
public class ClearValidatorsActionListener implements ActionListener {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG
= LogFactory.getLog(ClearValidatorsActionListener.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public PhaseId getPhaseId() {
return PhaseId.APPLY_REQUEST_VALUES;
}
@@ -89,7 +83,5 @@
}
}
}
-
-// ///////////////////////////////////////////// bean getter + setter
}