Author: snoopdave
Date: Sat Jan 14 19:42:07 2012
New Revision: 1231567
URL: http://svn.apache.org/viewvc?rev=1231567&view=rev
Log:
Removing unnecessary call to device registry, and doing an import cleanup
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?rev=1231567&r1=1231566&r2=1231567&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Sat Jan 14 19:42:07 2012
@@ -37,7 +37,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.ui.core.RollerContext;
import org.apache.roller.weblogger.ui.rendering.Renderer;
import org.apache.roller.weblogger.ui.rendering.RendererManager;
-import org.apache.roller.weblogger.ui.rendering.mobile.MobileDeviceRepository;
import org.apache.roller.weblogger.ui.rendering.model.ModelLoader;
import org.apache.roller.weblogger.ui.rendering.util.InvalidRequestException;
import org.apache.roller.weblogger.ui.rendering.util.ModDateHeaderUtil;
@@ -141,8 +140,6 @@ public class PageServlet extends HttpSer
}
}
-
-
Weblog weblog = null;
boolean isSiteWide = false;
@@ -242,16 +239,6 @@ public class PageServlet extends HttpSer
log.debug("Looking for template to use for rendering");
- // Get the deviceType from user agent
- MobileDeviceRepository.DeviceType deviceType =
MobileDeviceRepository.getRequestType(request);
-
- // for previews we explicitly set the deviceType attribute
- if (request.getParameter("type") != null) {
- deviceType = request.getParameter("type").equals("standard")
- ? MobileDeviceRepository.DeviceType.standard
- : MobileDeviceRepository.DeviceType.mobile;
- }
-
// figure out what template to use
ThemeTemplate page = null;
@@ -463,7 +450,7 @@ public class PageServlet extends HttpSer
Renderer renderer = null;
try {
log.debug("Looking up renderer");
- renderer = RendererManager.getRenderer(page, deviceType);
+ renderer = RendererManager.getRenderer(page,
pageRequest.getDeviceType());
} catch (Exception e) {
// nobody wants to render my content :(
log.error("Couldn't find renderer for page " + page.getId(), e);
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java?rev=1231567&r1=1231566&r2=1231567&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
Sat Jan 14 19:42:07 2012
@@ -29,7 +29,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.ui.rendering.mobile.MobileDeviceRepository;
import org.apache.roller.weblogger.util.URLUtilities;
import org.apache.roller.weblogger.util.Utilities;
@@ -96,7 +95,6 @@ public class WeblogPageRequest extends W
request.getRequestURL());
}
-
/*
* parse path info
*
