Update of /cvsroot/roller/roller/src/org/roller/presentation/velocity
In directory sc8-pr-cvs1:/tmp/cvs-serv19545/src/org/roller/presentation/velocity
Modified Files:
Macros.java VelocityHelper.java
Log Message:
Move RollerConfig to org.roller.model, and remove RefererDataEx and
WeblogEntryDataEx.
Index: Macros.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/velocity/Macros.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Macros.java 16 Apr 2003 18:47:43 -0000 1.65
--- Macros.java 24 Apr 2003 03:46:55 -0000 1.66
***************
*** 22,30 ****
import org.roller.model.RefererData;
import org.roller.model.RefererManager;
import org.roller.model.UserData;
import org.roller.model.UserManager;
import org.roller.model.WeblogCategoryData;
import org.roller.model.WebsiteData;
- import org.roller.presentation.RollerConfig;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
--- 22,30 ----
import org.roller.model.RefererData;
import org.roller.model.RefererManager;
+ import org.roller.model.RollerConfig;
import org.roller.model.UserData;
import org.roller.model.UserManager;
import org.roller.model.WeblogCategoryData;
import org.roller.model.WebsiteData;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
***************
*** 33,38 ****
import org.roller.presentation.tags.menu.EditorNavigationBarTag;
import org.roller.presentation.tags.menu.NavigationBarTag;
- import org.roller.presentation.users.WebsiteDataEx;
- import org.roller.presentation.weblog.RefererDataEx;
import org.roller.presentation.weblog.rss.RssBadgeTag;
import org.roller.presentation.weblog.tags.ViewWeblogEntriesTag;
--- 33,36 ----
***************
*** 352,361 ****
* @return Website object.
*/
! public WebsiteDataEx getWebsite()
{
try
{
! return new WebsiteDataEx(getRollerRequest().getWebsite(),
! (HttpServletRequest)mPageContext.getRequest());
}
catch (Exception e)
--- 350,358 ----
* @return Website object.
*/
! public WebsiteData getWebsite()
{
try
{
! return getRollerRequest().getWebsite();
}
catch (Exception e)
***************
*** 1101,1109 ****
for (int i = 0; i < count; i++)
{
- RefererDataEx referer = new RefererDataEx(
- (HttpServletRequest)mPageContext.getRequest(),refs[i]);
-
sb.append("<li class=\"rReferersListItem\">");
! sb.append( referer.getDisplayUrl( maxWidth, true ) );
sb.append("</li>");
}
--- 1098,1103 ----
for (int i = 0; i < count; i++)
{
sb.append("<li class=\"rReferersListItem\">");
! sb.append( refs[i].getDisplayUrl( maxWidth, true ) );
sb.append("</li>");
}
Index: VelocityHelper.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/velocity/VelocityHelper.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** VelocityHelper.java 23 Apr 2003 05:00:38 -0000 1.19
--- VelocityHelper.java 24 Apr 2003 03:46:55 -0000 1.20
***************
*** 17,20 ****
--- 17,21 ----
import org.roller.model.RefererData;
import org.roller.model.RefererManager;
+ import org.roller.model.RollerConfig;
import org.roller.model.UserData;
import org.roller.model.UserManager;
***************
*** 22,26 ****
import org.roller.model.WeblogEntryData;
import org.roller.model.WeblogManager;
- import org.roller.presentation.RollerConfig;
import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
--- 23,26 ----
***************
*** 29,33 ****
import org.roller.presentation.tags.calendar.CalendarTag;
import org.roller.presentation.tags.menu.RollerMenuModel;
- import org.roller.presentation.weblog.RefererDataEx;
import org.roller.presentation.weblog.formbeans.CommentFormEx;
import org.roller.presentation.weblog.tags.BigWeblogCalendarModel;
--- 29,32 ----
***************
*** 271,284 ****
public List getTodaysReferers()
{
- ArrayList referers = new ArrayList();
try
{
RefererData[] refs =
mRefererMgr.getTodaysReferers(mUsername);
! for (int i = 0; i < refs.length; i++)
! {
! RefererDataEx referer = new
RefererDataEx(mPageContext,refs[i]);
! referers.add(referer);
! }
}
catch (RollerException e)
--- 270,278 ----
public List getTodaysReferers()
{
try
{
RefererData[] refs =
mRefererMgr.getTodaysReferers(mUsername);
! return Arrays.asList(refs);
}
catch (RollerException e)
***************
*** 286,290 ****
mLogger.error("VelocityHelper getTodaysReferers()", e);
}
! return referers;
}
--- 280,284 ----
mLogger.error("VelocityHelper getTodaysReferers()", e);
}
! return new ArrayList();
}
***************
*** 309,313 ****
|| this.mRollerReq.isUserAuthorizedToEdit() )
{
! referers.add(new RefererDataEx(mPageContext,refs[i]));
}
}
--- 303,307 ----
|| this.mRollerReq.isUserAuthorizedToEdit() )
{
! referers.add(refs[i]);
}
}
***************
*** 700,703 ****
--- 694,740 ----
}
return sb.toString();
+ }
+
+
+
//-------------------------------------------------------------------------
+
+ public String getToggleLinkbackDisplayHTML(RefererData referer)
+ {
+ String ret = "";
+
+ String userName = mRollerReq.getUser().getUserName();
+
+ String link = null;
+ try
+ {
+ if ( mRollerReq.isUserAuthorizedToEdit() )
+ {
+ Hashtable params = new Hashtable();
+ params.put( RollerRequest.REFERERID_KEY,
referer.getId());
+ params.put( RollerRequest.USERNAME_KEY,
userName);
+ link = RequestUtils.computeURL( mPageContext,
+ "toggleLinkback", null, null, null,
params,null,false);
+
+ StringBuffer sb = new StringBuffer();
+ sb.append("[<a href=\"");
+ sb.append(link);
+ if ( referer.getVisible().booleanValue() )
+ {
+ sb.append("\">Visible</a>] ");
+ }
+ else
+ {
+ sb.append("\">Hidden</a>] ");
+ }
+ ret = sb.toString();
+ }
+ }
+ catch (Exception e)
+ {
+ // should never happen, but if it does:
+ mLogger.error("ERROR creating toggle-linkback URL",e);
+ }
+
+ return ret;
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
|
