You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/07/01 19:51:13 UTC

svn commit: r1688697 - in /myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago: el/ConstantMethodExpression.java internal/component/AbstractUIGridLayout.java

Author: lofwyr
Date: Wed Jul  1 17:51:13 2015
New Revision: 1688697

URL: http://svn.apache.org/r1688697
Log:
checkstyle

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java?rev=1688697&r1=1688696&r2=1688697&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/el/ConstantMethodExpression.java Wed Jul  1 17:51:13 2015
@@ -1,11 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.apache.myfaces.tobago.el;
 
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.MethodExpression;
 import javax.el.MethodInfo;
-import javax.el.MethodNotFoundException;
-import javax.el.PropertyNotFoundException;
 import javax.faces.component.StateHolder;
 import javax.faces.context.FacesContext;
 
@@ -24,13 +41,13 @@ public class ConstantMethodExpression ex
 
   @Override
   public MethodInfo getMethodInfo(ELContext context)
-      throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException {
+      throws NullPointerException, ELException {
     return null;
   }
 
   @Override
   public Object invoke(ELContext context, Object[] params)
-      throws NullPointerException, PropertyNotFoundException, MethodNotFoundException, ELException {
+      throws NullPointerException, ELException {
     return outcome;
   }
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=1688697&r1=1688696&r2=1688697&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Wed Jul  1 17:51:13 2015
@@ -60,8 +60,8 @@ public abstract class AbstractUIGridLayo
     final List<UIComponent> components = LayoutUtils.findLayoutChildren(getLayoutContainer());
     for (final UIComponent component : components) {
       if (component instanceof LayoutComponent) {
-        ((LayoutComponent)component).setCurrentHeight(null);
-        ((LayoutComponent)component).setCurrentWidth(null);
+        ((LayoutComponent) component).setCurrentHeight(null);
+        ((LayoutComponent) component).setCurrentWidth(null);
       }
       final int columnSpan = ComponentUtils.getIntAttribute(component, Attributes.COLUMN_SPAN, 1);
       final int rowSpan = ComponentUtils.getIntAttribute(component, Attributes.ROW_SPAN, 1);