devicemap-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wk...@apache.org
Subject svn commit: r1639933 - in /incubator/devicemap/trunk/examples/ddr-filter/src/main: java/org/apache/devicemap/example/webfilter/IdentificationFilter.java webapp/index.jsp
Date Sat, 15 Nov 2014 22:38:09 GMT
Author: wkeil
Date: Sat Nov 15 22:38:09 2014
New Revision: 1639933

URL: http://svn.apache.org/r1639933
Log:
DMAP-53: This is an epic for tasks or issues related to examples 

Task-Url: https://issues.apache.org/jira/browse/DMAP-53

Modified:
    incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java
    incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp

Modified: incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java?rev=1639933&r1=1639932&r2=1639933&view=diff
==============================================================================
--- incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java
(original)
+++ incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java
Sat Nov 15 22:38:09 2014
@@ -105,9 +105,6 @@ public class IdentificationFilter implem
             	System.out.println("H: " + displayHeight + "(" + displayHeight.exists() + ")");
             	request.setAttribute("displayHeight", displayHeight.getInteger());
             }
-            
-            request.setAttribute("vendor",
-					"dummy vendor");
         } catch (Exception ex) {
             System.err.println(ex.getLocalizedMessage());
             throw new RuntimeException(ex);

Modified: incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp?rev=1639933&r1=1639932&r2=1639933&view=diff
==============================================================================
--- incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp (original)
+++ incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp Sat Nov 15 22:38:09
2014
@@ -8,6 +8,7 @@
         <title>DeviceMap Simple DDR Sample</title>
     </head>
     <body>
-        <h1>${vendor} ${model} resolution: <%= request.getAttribute("displayWidth")
%> x <%= request.getAttribute("displayHeight") %></h1>
+        <h1><%= (request.getAttribute("vendor") != null ? request.getAttribute("vendor")
: "No vendor") %>
+        <%= (request.getAttribute("model") != null ? request.getAttribute("model") : "No
model") %> resolution: <%= request.getAttribute("displayWidth") %> x <%= request.getAttribute("displayHeight")
%></h1>
     </body>
 </html>
\ No newline at end of file



Mime
View raw message