You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/10/26 06:43:47 UTC
svn commit: r588519 - in
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger:
planet/ui/PlanetUIAction.java ui/rendering/model/PlanetModel.java
Author: snoopdave
Date: Thu Oct 25 21:43:45 2007
New Revision: 588519
URL: http://svn.apache.org/viewvc?rev=588519&view=rev
Log:
Use correct handle for default planet
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java?rev=588519&r1=588518&r2=588519&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java Thu Oct 25 21:43:45 2007
@@ -31,7 +31,7 @@
private static Log log = LogFactory.getLog(PlanetUIAction.class);
- public static final String PLANET_HANDLE = "zzz_default_planet_zzz";
+ public static final String DEFAULT_PLANET_HANDLE = "default";
// the planet used by all Planet actions
private Planet planet = null;
@@ -41,9 +41,9 @@
if(planet == null) {
try {
PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
- planet = pmgr.getPlanetById(PLANET_HANDLE);
+ planet = pmgr.getPlanet(DEFAULT_PLANET_HANDLE);
} catch(Exception ex) {
- log.error("Error loading weblogger planet - "+PLANET_HANDLE, ex);
+ log.error("Error loading weblogger planet - "+DEFAULT_PLANET_HANDLE, ex);
}
}
return planet;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java?rev=588519&r1=588518&r2=588519&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java Thu Oct 25 21:43:45 2007
@@ -44,6 +44,8 @@
*/
public class PlanetModel implements Model {
+ public static final String DEFAULT_PLANET_HANDLE = "default";
+
private static Log log = LogFactory.getLog(PlanetModel.class);
private WeblogRequest weblogRequest = null;
@@ -176,7 +178,7 @@
List list = new ArrayList();
try {
PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
- Planet defaultPlanet = planetManager.getPlanet("zzz_default_planet_zzz");
+ Planet defaultPlanet = planetManager.getPlanet(DEFAULT_PLANET_HANDLE);
PlanetGroup planetGroup = planetManager.getGroup(defaultPlanet, groupHandle);
List subs = planetManager.getTopSubscriptions(planetGroup, 0, length);
for (Iterator it = subs.iterator(); it.hasNext();) {