svn commit: r1623244 - in /tomcat/trunk/java/javax: el/BeanELResolver.java el/CompositeELResolver.java el/Util.java servlet/http/HttpUtils.java servlet/jsp/tagext/SimpleTagSupport.java

[markt]

Author: markt
Date: Sun Sep  7 22:54:07 2014
New Revision: 1623244

URL: http://svn.apache.org/r1623244
Log:
Code formatting.
Operator wrap -> eol
No functional change

Modified:
    tomcat/trunk/java/javax/el/BeanELResolver.java
    tomcat/trunk/java/javax/el/CompositeELResolver.java
    tomcat/trunk/java/javax/el/Util.java
    tomcat/trunk/java/javax/servlet/http/HttpUtils.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTagSupport.java

Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1623244&r1=1623243&r2=1623244&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Sun Sep  7 22:54:07 2014
@@ -185,8 +185,7 @@ public class BeanELResolver extends ELRe
         }
 
         context.setPropertyResolved(base, property);
-        return this.readOnly
-                || this.property(context, base, property).isReadOnly();
+        return this.readOnly || this.property(context, base, 
property).isReadOnly();
     }
 
     @Override
@@ -281,8 +280,8 @@ public class BeanELResolver extends ELRe
         }
 
         public boolean isReadOnly() {
-            return this.write == null
-                && (null == (this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod())));
+            return this.write == null &&
+                    (null == (this.write = Util.getMethod(this.owner, 
descriptor.getWriteMethod())));
         }
 
         public Method getWriteMethod() {

Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=1623244&r1=1623243&r2=1623244&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Sun Sep  7 22:54:07 2014
@@ -154,8 +154,8 @@ public class CompositeELResolver extends
         Class<?> commonType = null, type = null;
         for (int i = 0; i < sz; i++) {
             type = this.resolvers[i].getCommonPropertyType(context, base);
-            if (type != null
-                    && (commonType == null || 
commonType.isAssignableFrom(type))) {
+            if (type != null &&
+                    (commonType == null || commonType.isAssignableFrom(type))) 
{
                 commonType = type;
             }
         }

Modified: tomcat/trunk/java/javax/el/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/Util.java?rev=1623244&r1=1623243&r2=1623244&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/Util.java (original)
+++ tomcat/trunk/java/javax/el/Util.java Sun Sep  7 22:54:07 2014
@@ -74,8 +74,7 @@ class Util {
             }
             return template;
         } catch (MissingResourceException e) {
-            return "Missing Resource: '" + name + "' for Locale "
-                    + locale.getDisplayName();
+            return "Missing Resource: '" + name + "' for Locale " + 
locale.getDisplayName();
         }
     }
 

Modified: tomcat/trunk/java/javax/servlet/http/HttpUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpUtils.java?rev=1623244&r1=1623243&r2=1623244&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpUtils.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpUtils.java Sun Sep  7 22:54:07 2014
@@ -267,8 +267,7 @@ public class HttpUtils {
         url.append (scheme);                // http, https
         url.append ("://");
         url.append (req.getServerName ());
-        if ((scheme.equals ("http") && port != 80)
-                || (scheme.equals ("https") && port != 443)) {
+        if ((scheme.equals ("http") && port != 80) || (scheme.equals ("https") 
&& port != 443)) {
             url.append (':');
             url.append (req.getServerPort ());
         }

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTagSupport.java?rev=1623244&r1=1623243&r2=1623244&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTagSupport.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/SimpleTagSupport.java Sun Sep  7 
22:54:07 2014
@@ -184,9 +184,8 @@ public class SimpleTagSupport implements
     {
         boolean isInterface = false;
 
-        if (from == null || klass == null
-                || (!JspTag.class.isAssignableFrom(klass)
-                    && !(isInterface = klass.isInterface()))) {
+        if (from == null || klass == null || 
(!JspTag.class.isAssignableFrom(klass) &&
+                !(isInterface = klass.isInterface()))) {
             return null;
         }
 
@@ -206,8 +205,8 @@ public class SimpleTagSupport implements
                 parent = ((TagAdapter) parent).getAdaptee();
             }
 
-            if ((isInterface && klass.isInstance(parent))
-                    || klass.isAssignableFrom(parent.getClass())) {
+            if ((isInterface && klass.isInstance(parent)) ||
+                    klass.isAssignableFrom(parent.getClass())) {
                 return parent;
             }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org