roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r425877 - in /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui: authoring/struts/actions/ToggleLinkbackDisplayAction.java authoring/struts/actions/WeblogEntryFormAction.java core/RollerContext.java
Date Wed, 26 Jul 2006 22:18:11 GMT
Author: agilliland
Date: Wed Jul 26 15:18:10 2006
New Revision: 425877

URL: http://svn.apache.org/viewvc?rev=425877&view=rev
Log:
EOLing old createEntryPermalink() method from RollerContext.


Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java?rev=425877&r1=425876&r2=425877&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
Wed Jul 26 15:18:10 2006
@@ -93,7 +93,7 @@
 		{
 			RollerContext rctx = RollerContext.getRollerContext();
             if (entry != null) {
-                url = rctx.createEntryPermalink(entry, req, true);
+                url = entry.getPermalink();
             } else {
     			url = rreq.getWebsite().getURL();
             }

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java?rev=425877&r1=425876&r2=425877&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
Wed Jul 26 15:18:10 2006
@@ -659,7 +659,7 @@
                 String title = entry.getTitle();
                 String excerpt = StringUtils.left( Utilities.removeHTML(content),255 );
                 
-                String url = rctx.createEntryPermalink(entry, request, true);
+                String url = entry.getPermalink();
                 String blog_name = entry.getWebsite().getName();
                 
                 if (form.getTrackbackUrl() != null) {

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java?rev=425877&r1=425876&r2=425877&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java
Wed Jul 26 15:18:10 2006
@@ -439,27 +439,6 @@
     }
     
     
-    public String createEntryPermalink(
-            WeblogEntryData entry,
-            HttpServletRequest request,
-            boolean absolute) {
-        String link = null;
-        try {
-            String baseUrl = null;
-            if (absolute) {
-                baseUrl = RollerRuntimeConfig.getAbsoluteContextURL();
-            } else {
-                baseUrl = RollerRuntimeConfig.getRelativeContextURL();
-            }
-            link = StringEscapeUtils.escapeHtml(baseUrl + entry.getPermaLink());
-        } catch (Exception e) {
-            mLogger.error("Unexpected exception", e);
-        }
-        
-        return link;
-    }
-    
-    
     /**
      * Get the ServletContext.
      *



Mime
View raw message