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 [4/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/convert/ThemeConverter.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/convert/ThemeConverter.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.convert;
+
/*
* 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 09.12.2003 15:52:53.
- * $Id$
- */
-package org.apache.myfaces.tobago.convert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,18 +28,10 @@
public class ThemeConverter implements Converter {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(ThemeConverter.class);
public static final String CONVERTER_ID = "org.apache.myfaces.tobago.Theme";
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public String getAsString(
FacesContext facesContext, UIComponent component, Object object)
throws ConverterException {
@@ -63,7 +52,5 @@
throw new ConverterException("string='" + string + "'", e);
}
}
-
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodBinding.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodBinding.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodBinding.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodBinding.java Sat Feb 4 13:47:46 2006
@@ -1,28 +1,28 @@
+package org.apache.myfaces.tobago.el;
+
/*
* 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 09.01.2004 11:57:24.
* $Id$
*/
-package org.apache.myfaces.tobago.el;
import javax.faces.context.FacesContext;
-import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
-import javax.faces.el.MethodNotFoundException;
import java.io.Serializable;
public class ConstantMethodBinding
@@ -38,13 +38,11 @@
public ConstantMethodBinding() {
}
- public Object invoke(FacesContext facescontext, Object aobj[])
- throws EvaluationException, MethodNotFoundException {
+ public Object invoke(FacesContext facescontext, Object[] aobj) {
return outcome;
}
- public Class getType(FacesContext facescontext)
- throws MethodNotFoundException {
+ public Class getType(FacesContext facescontext){
return String.class;
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/UserWrapper.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.el;
+
/*
* 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 20.10.2004 11:38:48.
- * $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.el;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -58,9 +55,9 @@
FacesContext facesContext = FacesContext.getCurrentInstance();
boolean inRole = facesContext.getExternalContext().isUserInRole(role);
if (LOG.isDebugEnabled()) {
- LOG.debug("is in role '"+ key + "': " + inRole);
+ LOG.debug("is in role '" + key + "': " + inRole);
}
- return new Boolean(inRole);
+ return Boolean.valueOf(inRole);
}
public int size() {
@@ -107,5 +104,4 @@
throw new UnsupportedOperationException();
}
}
-
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/VariableResolverImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/VariableResolverImpl.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/VariableResolverImpl.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/el/VariableResolverImpl.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.el;
+
/*
* 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 20.10.2004 11:21:16.
- * $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.el;
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/event/DatePickerController.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/DatePickerController.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/DatePickerController.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/DatePickerController.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.event;
+
/*
* 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.event;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -50,7 +51,7 @@
}
public Object invoke(FacesContext facesContext, Object[] objects)
- throws EvaluationException, MethodNotFoundException {
+ throws EvaluationException {
if (objects[0] instanceof ActionEvent) {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,25 @@
+package org.apache.myfaces.tobago.event;
+
/*
* 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.02.2003 13:40:19.
* $Id$
*/
-package org.apache.myfaces.tobago.event;
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/event/SheetStateChangeEvent.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeEvent.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.event;
+
/*
* 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.event;
import javax.faces.component.UIComponent;
import javax.faces.event.FacesEvent;
@@ -35,7 +36,7 @@
}
public void processListener(FacesListener facesListener) {
- ((SheetStateChangeListener)facesListener).processSheetStateChange(this);
+ ((SheetStateChangeListener) facesListener).processSheetStateChange(this);
}
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeListener.java Sat Feb 4 13:47:46 2006
@@ -1,5 +1,21 @@
package org.apache.myfaces.tobago.event;
+/*
+ * 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 javax.faces.event.FacesListener;
/*
@@ -10,5 +26,5 @@
* To change this template use File | Settings | File Templates.
*/
public interface SheetStateChangeListener extends FacesListener {
- public void processSheetStateChange(SheetStateChangeEvent sheetStateChangeEvent);
+ void processSheetStateChange(SheetStateChangeEvent sheetStateChangeEvent);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/SheetStateChangeSource.java Sat Feb 4 13:47:46 2006
@@ -1,6 +1,22 @@
package org.apache.myfaces.tobago.event;
/*
+ * 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 by IntelliJ IDEA.
* User: bommel
* Date: 18.12.2005
@@ -9,13 +25,13 @@
*/
public interface SheetStateChangeSource {
- public javax.faces.el.MethodBinding getStateChangeListener();
+ javax.faces.el.MethodBinding getStateChangeListener();
- public void setStateChangeListener(javax.faces.el.MethodBinding actionListener);
+ void setStateChangeListener(javax.faces.el.MethodBinding actionListener);
- public void addStateChangeListener(SheetStateChangeListener listener);
+ void addStateChangeListener(SheetStateChangeListener listener);
- public SheetStateChangeListener[] getStateChangeListeners();
+ SheetStateChangeListener[] getStateChangeListeners();
- public void removeStateChangeListener(SheetStateChangeListener listener);
+ void removeStateChangeListener(SheetStateChangeListener listener);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.event;
+
/*
* 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.event;
import javax.faces.component.UIComponent;
import javax.faces.event.FacesEvent;
@@ -40,7 +41,7 @@
}
public void processListener(FacesListener facesListener) {
- ((TabChangeListener)facesListener).processTabChange(this);
+ ((TabChangeListener) facesListener).processTabChange(this);
}
public Object getOldState() {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeListener.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.event;
+
/*
* 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.event;
import javax.faces.event.FacesListener;
@@ -24,6 +25,6 @@
*/
public interface TabChangeListener extends FacesListener {
- public void processTabChange(TabChangeEvent tabChangeEvent);
+ void processTabChange(TabChangeEvent tabChangeEvent);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TabChangeSource.java Sat Feb 4 13:47:46 2006
@@ -1,5 +1,21 @@
package org.apache.myfaces.tobago.event;
+/*
+ * 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 by IntelliJ IDEA.
* User: bommel
@@ -9,13 +25,13 @@
*/
public interface TabChangeSource {
- public javax.faces.el.MethodBinding getTabChangeListener();
+ javax.faces.el.MethodBinding getTabChangeListener();
- public void setTabChangeListener(javax.faces.el.MethodBinding actionListener);
+ void setTabChangeListener(javax.faces.el.MethodBinding actionListener);
- public void addTabChangeListener(TabChangeListener listener);
+ void addTabChangeListener(TabChangeListener listener);
- public TabChangeListener[] getTabChangeListeners();
+ TabChangeListener[] getTabChangeListeners();
- public void removeTabChangeListener(TabChangeListener listener);
+ void removeTabChangeListener(TabChangeListener listener);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/CalendarModel.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/CalendarModel.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/CalendarModel.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/CalendarModel.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,26 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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: Nov 20, 2002 10:05:10 PM
* $Id: CalendarModel.java,v 1.1.1.1 2004/04/15 18:41:00 idus Exp $
*/
-package org.apache.myfaces.tobago.model;
+
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -25,9 +28,9 @@
public class CalendarModel {
- DateModel[][] calendarArray;
- int firstDayOffset;
- int firstDayOfWeek;
+ private DateModel[][] calendarArray;
+ private int firstDayOffset;
+ //private int firstDayOfWeek;
public CalendarModel(Calendar calendar) {
// int weekCount = CalendarUtils.weekCount(calendar);
@@ -38,7 +41,7 @@
c.set(Calendar.DAY_OF_MONTH, 1);
// assert c.isLenient() : "'add -x days' may not work in a non-lenient calendar";
firstDayOffset = firstDayOffset(c);
- firstDayOfWeek = c.getFirstDayOfWeek();
+ //firstDayOfWeek = c.getFirstDayOfWeek();
c.add(Calendar.DAY_OF_WEEK, -firstDayOffset);
for (int week = 0; week < weekCount; ++week) {
for (int day = 0; day < 7; ++day) {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/DateModel.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/DateModel.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/DateModel.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/DateModel.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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 20, 2002 10:00:32 PM
- * $Id: DateModel.java,v 1.1.1.1 2004/04/15 18:41:00 idus 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.model;
import java.util.Calendar;
import java.util.Locale;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageState.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageState.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageState.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageState.java Sat Feb 4 13:47:46 2006
@@ -1,28 +1,25 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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 05.02.2003 09:25:31.
- * $Id$
- */
-package org.apache.myfaces.tobago.model;
public interface PageState {
- public int getClientWidth();
- public void setClientWidth(int width);
- public int getClientHeight();
- public void setClientHeight(int height);
+ int getClientWidth();
+ void setClientWidth(int width);
+ int getClientHeight();
+ void setClientHeight(int height);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageStateImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageStateImpl.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageStateImpl.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/PageStateImpl.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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 17.01.2005 11:29:00.
- * $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.model;
public class PageStateImpl implements PageState {
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SelectItem.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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.model;
import org.apache.myfaces.tobago.component.UISelectItem;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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 22.06.2004 09:08:37.
- * $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.model;
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/model/SortableByApplication.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SortableByApplication.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SortableByApplication.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SortableByApplication.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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.model;
/*
* Created 20.04.2004 at 12:59:34.
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.model;
+
/*
* 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 05.02.2003 09:25:31.
- * $Id$
- */
-package org.apache.myfaces.tobago.model;
import javax.swing.tree.DefaultMutableTreeNode;
import java.util.Enumeration;
@@ -32,27 +29,20 @@
* 3. marker: last used action object<br />
*/
public class TreeState {
-// ------------------------------------------------------------------ constants
public static final String SEP = ";";
-// ----------------------------------------------------------------- attributes
-
private Set<DefaultMutableTreeNode> selection;
private Set<DefaultMutableTreeNode> expandState;
private DefaultMutableTreeNode marker;
private DefaultMutableTreeNode lastMarker;
private String lastCommand;
-// --------------------------------------------------------------- constructors
-
public TreeState() {
selection = new HashSet<DefaultMutableTreeNode>();
expandState = new HashSet<DefaultMutableTreeNode>();
}
-// ----------------------------------------------------------- business methods
-
public void addExpandState(DefaultMutableTreeNode expandStateItem) {
expandState.add(expandStateItem);
}
@@ -79,13 +69,11 @@
}
public void expand(DefaultMutableTreeNode node, int level) {
- if (level <= 0) {
- // nothing to do
- } else {
- if (! expandState.contains(node)) {
+ if (level > 0) {
+ if (!expandState.contains(node)) {
expandState.add(node);
}
- for (Enumeration i = node.children(); i.hasMoreElements(); ) {
+ for (Enumeration i = node.children(); i.hasMoreElements();) {
DefaultMutableTreeNode child = (DefaultMutableTreeNode) i.nextElement();
expand(child, level - 1);
}
@@ -94,12 +82,12 @@
/** Expands all parents which contains selected children. */
public void expandSelection() {
- for (Iterator i = selection.iterator(); i.hasNext(); ) {
+ for (Iterator i = selection.iterator(); i.hasNext();) {
DefaultMutableTreeNode selected = (DefaultMutableTreeNode) i.next();
for (DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selected.getParent();
parent != null;
parent = (DefaultMutableTreeNode) parent.getParent()) {
- if (! expandState.contains(parent)) {
+ if (!expandState.contains(parent)) {
expandState.add(parent);
}
}
@@ -117,8 +105,6 @@
public boolean isSelected(DefaultMutableTreeNode node) {
return selection.contains(node);
}
-
-// ------------------------------------------------------------ getter + setter
public Set<DefaultMutableTreeNode> getExpandState() {
return expandState;
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,26 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 09.03.2004 12:26:39.
* $Id$
*/
-package org.apache.myfaces.tobago.renderkit;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,21 +34,12 @@
public abstract class BoxRendererBase extends RendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(BoxRendererBase.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public boolean getRendersChildren() {
return true;
}
-
public int getFixedHeight(FacesContext facesContext, UIComponent component) {
int height =
@@ -74,7 +68,5 @@
height += getPaddingHeight(facesContext, component);
return height;
}
-
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/CommandRendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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.04.2003 at 15:10:58.
- * $Id$
- */
-package org.apache.myfaces.tobago.renderkit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,16 +28,8 @@
public abstract class CommandRendererBase extends RendererBase {
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(CommandRendererBase.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
public void decode(FacesContext facesContext, UIComponent component) {
// boolean active = false;
if (ComponentUtil.isOutputOnly(component)) {
@@ -93,7 +82,5 @@
}
return onclick;
}
-
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/GenericRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,36 +1,23 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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.2004 10:41:44.
- * $Id$
- */
-package org.apache.myfaces.tobago.renderkit;
import javax.faces.render.Renderer;
public class GenericRenderer extends Renderer {
-
-// ///////////////////////////////////////////// constant
-
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 on: 15.02.2002, 17:44:18
- * $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.renderkit;
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/renderkit/InputRendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/InputRendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 15.04.2003 at 09:26:24.
- * $Id$
- */
-package org.apache.myfaces.tobago.renderkit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -50,12 +47,11 @@
.getRequestParameterMap();
if (requestParameterMap.containsKey(clientId)) {
if (LOG.isDebugEnabled()) {
- LOG.debug("clientId = '" +
- clientId + "'");
- LOG.debug("requestParameterMap.get(clientId) = '" +
- requestParameterMap.get(clientId) + "'");
- LOG.debug("requestParameterMap.get(clientId).getClass().getName() = '" +
- requestParameterMap.get(clientId).getClass().getName() + "'");
+ LOG.debug("clientId = '" + clientId + "'");
+ LOG.debug("requestParameterMap.get(clientId) = '"
+ + requestParameterMap.get(clientId) + "'");
+ LOG.debug("requestParameterMap.get(clientId).getClass().getName() = '"
+ + requestParameterMap.get(clientId).getClass().getName() + "'");
}
String newValue = (String) requestParameterMap.get(clientId);
uiInput.setSubmittedValue(newValue);
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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.09.2004 14:11:53.
- * $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.renderkit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,19 +28,14 @@
import javax.faces.component.UIComponent;
public final class LabelWithAccessKey {
-// ------------------------------------------------------------------ constants
private static final Log LOG = LogFactory.getLog(LabelWithAccessKey.class);
-// ----------------------------------------------------------------- attributes
-
- public String text;
- public Character accessKey;
- public int pos = -1;
+ private String text;
+ private Character accessKey;
+ private int pos = -1;
public static final char INDICATOR = '_';
-// --------------------------------------------------------------- constructors
-
public LabelWithAccessKey(UIComponent component) {
if (RENDERER_TYPE_LABEL.equals(component.getRendererType())) {
@@ -93,18 +85,24 @@
}
}
-// ------------------------------------------------------------ getter + setter
-
public String getText() {
return text;
}
- public Character getAccessKey() {
+ public Character getAccessKey1() {
return accessKey;
}
public int getPos() {
return pos;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public void setAccessKey(Character accessKey) {
+ this.accessKey = accessKey;
}
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabeledLayoutRender.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabeledLayoutRender.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabeledLayoutRender.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LabeledLayoutRender.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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;
/**
* User: weber
@@ -21,5 +22,5 @@
* Time: 1:03:23 PM
*/
public interface LabeledLayoutRender {
- public String getDefaultLayoutOrder();
+ String getDefaultLayoutOrder();
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutManager.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutManager.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutManager.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutManager.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -29,9 +30,9 @@
*/
public interface LayoutManager {
-/**
- * @deprecated
- */
- public void layoutBegin(FacesContext facesContext, UIComponent component);
+ /**
+ * @deprecated
+ */
+ void layoutBegin(FacesContext facesContext, UIComponent component);
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutRenderer.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutRenderer.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutRenderer.java Sat Feb 4 13:47:46 2006
@@ -1,19 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,7 +35,7 @@
private static final Log LOG = LogFactory.getLog(LayoutRenderer.class);
- public abstract void layoutWidth(FacesContext facesContext, UIComponent component) ;
+ public abstract void layoutWidth(FacesContext facesContext, UIComponent component);
public abstract void layoutHeight(FacesContext facesContext, UIComponent component);
public abstract void prepareRender(FacesContext facesContext, UIComponent component);
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/MessageRendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/MessageRendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/MessageRendererBase.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/MessageRendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 21.01.2004 08:01:07.
- * $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.renderkit;
public class MessageRendererBase extends RendererBase {
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 15.04.2003 at 09:26:24.
- * $Id$
- */
-package org.apache.myfaces.tobago.renderkit;
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/renderkit/RenderUtil.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RenderUtil.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RenderUtil.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RenderUtil.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 11.11.2003 11:16:41.
- * $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.renderkit;
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/renderkit/RendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 15:44:53.
- * $Id$
- */
-package org.apache.myfaces.tobago.renderkit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,13 +44,9 @@
import java.util.Iterator;
import java.util.List;
-// TODO: in java 1.5 use: import static org.apache.myfaces.tobago.TobagoConstants.*;
public abstract class RendererBase
extends Renderer implements TobagoRenderer {
-
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(RendererBase.class);
public static final String BEGIN_POSTFIX = "Begin";
@@ -62,17 +55,11 @@
public static final String END_POSTFIX = "";
-// ///////////////////////////////////////////// attribute
-
- protected String beginSniplet;
-
- protected String childrenSniplet;
-
- protected String endSniplet;
+ private String beginSniplet;
-// ///////////////////////////////////////////// constructor
+ private String childrenSniplet;
-// ///////////////////////////////////////////// code
+ private String endSniplet;
public void encodeBegin(FacesContext facesContext, UIComponent component)
throws IOException {
@@ -80,15 +67,6 @@
LOG.debug("*** begin " + component);
}
try {
- // TODO: this is HTML move in Layout
-
-// if (! (component instanceof UIPage)) {
-// LayoutManager layoutManager = getLayoutManager(facesContext, component);
-//
-// if (layoutManager != null) {
-// layoutManager.layoutBegin(facesContext, component);
-// }
-// }
encodeBeginTobago(facesContext, component);
} catch (IOException e) {
throw e;
@@ -114,27 +92,8 @@
if (component instanceof UIPage) {
LOG.info("UUUUUUUUUUUUUUUUUUUUU UIPage XXXXXXXXXXXXXXXXXXXXXXXXXXXXxx");
}
-// UIComponent layout = null;
- //if (LayoutUtil.isTransparentForLayout(component)) {
- // layout = component.getParent().getFacet("layout");
- //} else {
-// layout = component.getFacet("layout");
- //}
-// if (layout != null) {
- // ((LayoutManager)ComponentUtil.getRenderer(layout, facesContext))
- // .layoutBegin(facesContext, component);
-// layout.encodeBegin(facesContext);
- /*for (Iterator iterator = component.getChildren().iterator(); iterator.hasNext();) {
- UIComponent child = (UIComponent) iterator.next();
- ((LayoutManager)ComponentUtil.getRenderer(layout, facesContext))
- .layoutBegin(facesContext, child);
- }*/
-// layout.encodeChildren(facesContext);
-// layout.encodeEnd(facesContext);
-// } else {
- encodeChildrenTobago(facesContext, component);
-// }
+ encodeChildrenTobago(facesContext, component);
if (LOG.isDebugEnabled()) {
LOG.debug("* children " + component);
@@ -169,9 +128,8 @@
// FIXME later:
if (component instanceof UIInput) {
- LOG.warn(
- "decode() should be overwritten! Renderer: " +
- this.getClass().getName());
+ LOG.warn("decode() should be overwritten! Renderer: "
+ + this.getClass().getName());
}
}
@@ -311,13 +269,12 @@
/**
* Normally not needed to overrwrite
* */
- public void encodeBeginTobago(
- FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBeginTobago(FacesContext facesContext,
+ UIComponent component) throws IOException {
}
- public void encodeChildrenTobago(
- FacesContext facesContext, UIComponent component)
- throws IOException {
+ public void encodeChildrenTobago(FacesContext facesContext,
+ UIComponent component) throws IOException {
for (Iterator i = component.getChildren().iterator(); i.hasNext();) {
UIComponent child = (UIComponent) i.next();
//l
@@ -335,8 +292,7 @@
}
}
- public void encodeEndTobago (
- FacesContext facesContext,
+ public void encodeEndTobago(FacesContext facesContext,
UIComponent component) throws IOException {
}
@@ -391,7 +347,7 @@
}
if (converter != null && submittedValue instanceof String) {
result
- = converter.getAsObject(context, component, (String)submittedValue);
+ = converter.getAsObject(context, component, (String) submittedValue);
return result;
} else {
throw new ConverterException("type conversion error: "
@@ -403,9 +359,9 @@
FacesContext facesContext, UIComponent component){
Object value = null;
if (component instanceof ValueHolder) {
- value = ((ValueHolder)component).getLocalValue();
+ value = ((ValueHolder) component).getLocalValue();
if (value == null) {
- value = ((ValueHolder)component).getValue();
+ value = ((ValueHolder) component).getValue();
}
}
return getFormattedValue(facesContext, component, value);
@@ -438,9 +394,5 @@
return converter.getAsString(context, component, currentValue);
}
}
-
-
-
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
URL: http://svn.apache.org/viewcvs/incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java?rev=374936&r1=374935&r2=374936&view=diff
==============================================================================
--- incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ incubator/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Sat Feb 4 13:47:46 2006
@@ -1,23 +1,20 @@
+package org.apache.myfaces.tobago.renderkit;
+
/*
* 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 15.04.2003 at 10:17:34.
- * $Id$
- */
-package org.apache.myfaces.tobago.renderkit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,16 +26,7 @@
public class SelectManyRendererBase extends RendererBase {
-// ///////////////////////////////////////////// constant
-
- private static final Log LOG = LogFactory.getLog(
- SelectManyRendererBase.class);
-
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
+ private static final Log LOG = LogFactory.getLog(SelectManyRendererBase.class);
public void decode(FacesContext facesContext, UIComponent component) {
if (ComponentUtil.isOutputOnly(component)) {
@@ -47,8 +35,8 @@
UISelectMany uiSelectMany = (UISelectMany) component;
- String newValue[] =
- (String[]) facesContext.getExternalContext().getRequestParameterValuesMap().get(uiSelectMany.getClientId(facesContext));
+ String[] newValue = (String[])
+ facesContext.getExternalContext().getRequestParameterValuesMap().get(uiSelectMany.getClientId(facesContext));
if (LOG.isDebugEnabled()) {
LOG.debug("decode: key='" + component.getClientId(facesContext)
+ "' value='" + newValue + "'");
@@ -68,8 +56,6 @@
uiSelectMany.setValue(newValue);
uiSelectMany.setValid(true);
}
-
-// ///////////////////////////////////////////// bean getter + setter
}