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 2016/04/08 17:05:29 UTC
svn commit: r1738257 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/
tobago-extension/ tobago-theme/tobago-theme-stan...
Author: lofwyr
Date: Fri Apr 8 15:05:29 2016
New Revision: 1738257
URL: http://svn.apache.org/viewvc?rev=1738257&view=rev
Log:
checkstyle
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.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/AbstractUISheet.java?rev=1738257&r1=1738256&r2=1738257&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java Fri Apr 8 15:05:29 2016
@@ -137,7 +137,7 @@ public abstract class AbstractUISheet ex
autoLayout = true;
if (columnLayout != null) {
for (LayoutToken layoutToken : columnLayout.getTokens()) {
- if (! (layoutToken instanceof AutoLayoutToken)) {
+ if (!(layoutToken instanceof AutoLayoutToken)) {
autoLayout = false;
break;
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java?rev=1738257&r1=1738256&r2=1738257&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/AuthorizationHelper.java Fri Apr 8 15:05:29 2016
@@ -1,3 +1,22 @@
+/*
+ * 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.internal.util;
import org.slf4j.Logger;
@@ -56,7 +75,7 @@ public class AuthorizationHelper {
try {
final InitialContext context = new InitialContext();
- beanManager = (BeanManager)context.lookup("java:comp/BeanManager");
+ beanManager = (BeanManager) context.lookup("java:comp/BeanManager");
} catch (Exception exception) {
LOG.warn("Can't obtain 'java:comp/BeanManager'", exception);
}
@@ -74,7 +93,7 @@ public class AuthorizationHelper {
public static AuthorizationHelper getInstance(final FacesContext facesContext) {
return (AuthorizationHelper)
- facesContext.getELContext().getELResolver().getValue(facesContext.getELContext(),null, AUTHORIZATION_HELPER);
+ facesContext.getELContext().getELResolver().getValue(facesContext.getELContext(), null, AUTHORIZATION_HELPER);
}
public boolean isAuthorized(final FacesContext facesContext, final String expression) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/pom.xml?rev=1738257&r1=1738256&r2=1738257&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/pom.xml Fri Apr 8 15:05:29 2016
@@ -4,8 +4,7 @@
* 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
+ * (the "License"); you may not use this file except in compliance withA
*
* http://www.apache.org/licenses/LICENSE-2.0
*
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java?rev=1738257&r1=1738256&r2=1738257&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/test/java/org/apache/myfaces/tobago/renderkit/html/JsonUtilsUnitTest.java Fri Apr 8 15:05:29 2016
@@ -132,17 +132,17 @@ public class JsonUtilsUnitTest extends A
@Test
public void decodeIntegerArray() {
- Assert.assertEquals(Arrays.asList(1,2,3,4), JsonUtils.decodeIntegerArray("[1,2,3,4]"));
+ Assert.assertEquals(Arrays.asList(1, 2, 3, 4), JsonUtils.decodeIntegerArray("[1,2,3,4]"));
- Assert.assertEquals(Arrays.asList(1,2,3,4), JsonUtils.decodeIntegerArray(" [ 1 , 2 , 3 , 4 ] "));
+ Assert.assertEquals(Arrays.asList(1, 2, 3, 4), JsonUtils.decodeIntegerArray(" [ 1 , 2 , 3 , 4 ] "));
Assert.assertEquals(Arrays.asList(1), JsonUtils.decodeIntegerArray("[1]"));
Assert.assertEquals(Arrays.asList(), JsonUtils.decodeIntegerArray("[]"));
- Assert.assertEquals(Arrays.asList(1000000000,2,3,4), JsonUtils.decodeIntegerArray("[1000000000,2,3,4]"));
+ Assert.assertEquals(Arrays.asList(1000000000, 2, 3, 4), JsonUtils.decodeIntegerArray("[1000000000,2,3,4]"));
- Assert.assertEquals(Arrays.asList(2,3,4), JsonUtils.decodeIntegerArray("[null,2,3,4]"));
+ Assert.assertEquals(Arrays.asList(2, 3, 4), JsonUtils.decodeIntegerArray("[null,2,3,4]"));
Assert.assertEquals(null, JsonUtils.decodeIntegerArray("1,2,3,4"));
}