You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/03/11 07:29:31 UTC
svn commit: r1576198 - in /roller/trunk/app/src:
main/java/org/apache/roller/weblogger/business/jpa/
main/java/org/apache/roller/weblogger/pojos/
main/java/org/apache/roller/weblogger/pojos/wrapper/
main/java/org/apache/roller/weblogger/ui/struts2/edit...
Author: gmazza
Date: Tue Mar 11 06:29:30 2014
New Revision: 1576198
URL: http://svn.apache.org/r1576198
Log:
Made bookmark priority autogenerated (first in highest priority) similar to categories; moved feedurl to blogroll list display.
Removed:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_da.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_is.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java Tue Mar 11 06:29:30 2014
@@ -69,7 +69,7 @@ public class JPABookmarkManagerImpl impl
boolean exists = getBookmark(bookmark.getId()) != null;
if (!exists) {
// New object make sure that relationship is set on managed copy of other side
- bookmark.getFolder().getBookmarks().add(bookmark);
+ bookmark.getFolder().addBookmark(bookmark);
}
this.strategy.store(bookmark);
@@ -203,7 +203,6 @@ public class JPABookmarkManagerImpl impl
desc,
url,
xmlUrl,
- 100,
null);
parent.addBookmark(bd);
// TODO: maybe this should be saving the folder?
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Tue Mar 11 06:29:30 2014
@@ -317,7 +317,6 @@ public class JPAWeblogManagerImpl implem
"default", newWeblog);
this.strategy.store(root);
- Integer zero = 0;
String blogroll = WebloggerConfig.getProperty("newuser.blogroll");
if (blogroll != null) {
String[] splitroll = blogroll.split(",");
@@ -330,7 +329,6 @@ public class JPAWeblogManagerImpl implem
"", // description
rollitems[1].trim(), // url
null, // feedurl
- zero, // priority
null); // image
this.strategy.store(b);
root.getBookmarks().add(b);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java Tue Mar 11 06:29:30 2014
@@ -55,15 +55,21 @@ public class WeblogBookmark implements S
String desc,
String url,
String feedUrl,
- Integer priority,
String image) {
this.folder = parent;
this.name = name;
this.description = desc;
this.url = url;
this.feedUrl = feedUrl;
- this.priority = priority;
this.image = image;
+
+ folder.addBookmark(this);
+ int size = folder.getBookmarks().size();
+ if (size == 1) {
+ this.priority = 0;
+ } else {
+ this.priority = folder.getBookmarks().get(size - 2).getPriority() + 1;
+ }
}
//------------------------------------------------------------- Attributes
@@ -168,6 +174,7 @@ public class WeblogBookmark implements S
return new EqualsBuilder()
.append(getName(), o.getName())
.append(getFolder(), o.getFolder())
+ .append(getUrl(), o.getUrl())
.isEquals();
}
@@ -175,19 +182,17 @@ public class WeblogBookmark implements S
return new HashCodeBuilder()
.append(getName())
.append(getFolder())
+ .append(getUrl())
.toHashCode();
}
-
-
+
/**
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
public int compareTo(WeblogBookmark o) {
- return bookmarkComparator.compare(this, o);
+ return priority.compareTo(o.getPriority());
}
- private BookmarkComparator bookmarkComparator = new BookmarkComparator();
-
public Weblog getWebsite() {
return getFolder().getWeblog();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Tue Mar 11 06:29:30 2014
@@ -19,9 +19,8 @@
package org.apache.roller.weblogger.pojos;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.logging.Log;
@@ -49,7 +48,7 @@ public class WeblogBookmarkFolder implem
// associations
private Weblog weblog = null;
- private Set<WeblogBookmark> bookmarks = new TreeSet<WeblogBookmark>();
+ private List<WeblogBookmark> bookmarks = new ArrayList<WeblogBookmark>();
public WeblogBookmarkFolder() {
@@ -150,21 +149,23 @@ public class WeblogBookmarkFolder implem
/**
* Get bookmarks contained in this folder.
*/
- public Set<WeblogBookmark> getBookmarks() {
+ public List<WeblogBookmark> getBookmarks() {
return this.bookmarks;
}
// this is private to force the use of add/remove bookmark methods.
- private void setBookmarks(Set<WeblogBookmark> bookmarks) {
+ private void setBookmarks(List<WeblogBookmark> bookmarks) {
this.bookmarks = bookmarks;
}
/**
* Add a bookmark to this folder.
*/
- public void addBookmark(WeblogBookmark bookmark) throws WebloggerException {
+ public void addBookmark(WeblogBookmark bookmark) {
bookmark.setFolder(this);
- getBookmarks().add(bookmark);
+ if (!getBookmarks().contains(bookmark)) {
+ getBookmarks().add(bookmark);
+ }
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java Tue Mar 11 06:29:30 2014
@@ -20,10 +20,6 @@ package org.apache.roller.weblogger.pojo
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.BookmarkComparator;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -40,8 +36,7 @@ public final class WeblogBookmarkFolderW
private WeblogBookmarkFolderWrapper(WeblogBookmarkFolder toWrap) {
this.pojo = toWrap;
}
-
-
+
// wrap the given pojo if it is not null
public static WeblogBookmarkFolderWrapper wrap(WeblogBookmarkFolder toWrap) {
if (toWrap != null) {
@@ -49,51 +44,22 @@ public final class WeblogBookmarkFolderW
}
return null;
}
-
-
+
public String getId() {
return this.pojo.getId();
}
-
-
+
public String getName() {
return this.pojo.getName();
}
-
-
+
public List<WeblogBookmarkWrapper> getBookmarks() {
- Set<WeblogBookmark> initialCollection = new TreeSet<WeblogBookmark>(new BookmarkComparator());
- initialCollection.addAll(this.pojo.getBookmarks());
-
// iterate through and wrap
- // we force the use of an ArrayList because it should be good enough to cover
- // for any Collection type we encounter.
- List<WeblogBookmarkWrapper> wrappedCollection = new ArrayList<WeblogBookmarkWrapper>(initialCollection.size());
- int i = 0;
- for (WeblogBookmark bookmark : initialCollection) {
- wrappedCollection.add(i,WeblogBookmarkWrapper.wrap(bookmark));
- i++;
+ List<WeblogBookmarkWrapper> wrappedCollection = new ArrayList<WeblogBookmarkWrapper>(this.pojo.getBookmarks().size());
+ for (WeblogBookmark bookmark : this.pojo.getBookmarks()) {
+ wrappedCollection.add(WeblogBookmarkWrapper.wrap(bookmark));
}
return wrappedCollection;
}
-
-
- public List<WeblogBookmarkWrapper> retrieveBookmarks()
- throws WebloggerException {
-
- List<WeblogBookmark> initialCollection = this.pojo.retrieveBookmarks();
-
- // iterate through and wrap
- // we force the use of an ArrayList because it should be good enough to cover
- // for any Collection type we encounter.
- List<WeblogBookmarkWrapper> wrappedCollection = new ArrayList<WeblogBookmarkWrapper>(initialCollection.size());
- int i = 0;
- for (WeblogBookmark bookmark : initialCollection) {
- wrappedCollection.add(i,WeblogBookmarkWrapper.wrap(bookmark));
- i++;
- }
- return wrappedCollection;
- }
-
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Tue Mar 11 06:29:30 2014
@@ -104,9 +104,12 @@ public class BookmarkAdd extends UIActio
if(!hasActionErrors()) {
try {
- WeblogBookmark newBookmark = new WeblogBookmark();
- newBookmark.setFolder(getFolder());
- getBean().copyTo(newBookmark);
+ WeblogBookmark newBookmark = new WeblogBookmark(getFolder(),
+ getBean().getName(),
+ getBean().getDescription(),
+ getBean().getUrl(),
+ getBean().getFeedUrl(),
+ getBean().getImage());
BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
bmgr.saveBookmark(newBookmark);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkBean.java Tue Mar 11 06:29:30 2014
@@ -30,7 +30,6 @@ public class BookmarkBean {
private String name = null;
private String description = null;
private String url = null;
- private Integer priority = 0;
private String image = null;
private String feedUrl = null;
@@ -67,14 +66,6 @@ public class BookmarkBean {
this.url = url;
}
- public Integer getPriority() {
- return this.priority;
- }
-
- public void setPriority( Integer priority ) {
- this.priority = priority;
- }
-
public String getImage() {
return this.image;
}
@@ -96,7 +87,6 @@ public class BookmarkBean {
dataHolder.setName(this.name);
dataHolder.setDescription(this.description);
dataHolder.setUrl(this.url);
- dataHolder.setPriority(this.priority);
dataHolder.setImage(this.image);
dataHolder.setFeedUrl(this.feedUrl);
}
@@ -107,7 +97,6 @@ public class BookmarkBean {
this.name = dataHolder.getName();
this.description = dataHolder.getDescription();
this.url = dataHolder.getUrl();
- this.priority = dataHolder.getPriority();
this.image = dataHolder.getImage();
this.feedUrl = dataHolder.getFeedUrl();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Tue Mar 11 06:29:30 2014
@@ -97,7 +97,6 @@ public class Bookmarks extends UIAction
// Build list of all folders, except for current one
BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
List<WeblogBookmarkFolder> folders = bmgr.getAllFolders(getActionWeblog());
- log.info("*** Folder ID is: " + getFolderId());
for (WeblogBookmarkFolder fd : folders) {
if (!fd.getId().equals(getFolderId())) {
newFolders.add(fd);
@@ -123,8 +122,6 @@ public class Bookmarks extends UIAction
BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
- log.info("Deleting selected bookmarks.");
-
try {
WeblogBookmark bookmark;
String bookmarks[] = getSelectedBookmarks();
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Tue Mar 11 06:29:30 2014
@@ -85,7 +85,8 @@ bookmarksForm.checkNone=Select None
bookmarksForm.delete=Delete selected
bookmarksForm.delete.confirm=Delete selected bookmarks?
bookmarksForm.deleteFolder.confirm=Delete entire folder including all its bookmarks?
-bookmarksForm.description=URL
+bookmarksForm.url=URL
+bookmarksForm.feedurl=Newsfeed URL
bookmarksForm.folder=Bookmark Folder
bookmarksForm.deleteFolder=Delete folder
bookmarksForm.viewFolder=Switch to Folder
Modified: roller/trunk/app/src/main/resources/ApplicationResources_da.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_da.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Tue Mar 11 06:29:30 2014
@@ -82,7 +82,6 @@ bookmarksForm.checkAll=V�lg alle
bookmarksForm.checkNone=V�lg ingen
bookmarksForm.delete=Slet valgte
bookmarksForm.delete.confirm=Slet valgte bogm�rker?
-bookmarksForm.description=
bookmarksForm.folder=Bogm�rke samling
bookmarksForm.priority=Prioritet
bookmarksForm.edit=Ret
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Tue Mar 11 06:29:30 2014
@@ -113,7 +113,6 @@ bookmarksForm.checkAll=Alle ausw\u00E4hl
bookmarksForm.checkNone=Keinen ausw\u00E4hlen
bookmarksForm.delete=L\u00F6sche Auswahl
bookmarksForm.delete.confirm=Ausgew\u00E4hlte Lesezeichen l\u00F6schen?
-bookmarksForm.description=
bookmarksForm.edit=Bearbeiten
bookmarksForm.edit.tip=Anklicken um das Lesezeichen zu bearbeiten
bookmarksForm.error.move=Fehler beim Verschieben, Elternknoten nach Kindknoten zu verschieben ist nicht erlaubt
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Tue Mar 11 06:29:30 2014
@@ -30,7 +30,6 @@ bookmarksForm.addFolder = A\u00F1adir ca
bookmarksForm.checkAll = Seleccionar todo
bookmarksForm.checkNone = No seleccionar ninguno
bookmarksForm.delete = Borrar seleccionado
-bookmarksForm.description =
bookmarksForm.folder = Carpeta de marcador
bookmarksForm.edit = Editar
bookmarksForm.edit.tip = Haga click para editar esta marcador
Modified: roller/trunk/app/src/main/resources/ApplicationResources_is.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_is.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_is.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_is.properties Tue Mar 11 06:29:30 2014
@@ -74,7 +74,6 @@ bookmarksForm.addFolder=N�tt tengla
bookmarksForm.checkAll=Velja allt
bookmarksForm.checkNone=Velja ekkert
bookmarksForm.delete=Ey�a v�ldu
-bookmarksForm.description=
bookmarksForm.edit=Breyta
bookmarksForm.edit.tip=Smelltu til a� breyta �essum tengli e�a tenglasafni
bookmarksForm.folder=Tenglasafn
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Tue Mar 11 06:29:30 2014
@@ -65,7 +65,6 @@ bookmarksForm.addFolder=\u30D6\u30C3\u30
bookmarksForm.checkAll=\u3059\u3079\u3066\u9078\u629E
bookmarksForm.checkNone=\u3059\u3079\u3066\u9078\u629E\u3092\u89E3\u9664\u3059\u308B
bookmarksForm.delete=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664
-bookmarksForm.description=
bookmarksForm.folder=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u30D5\u30A9\u30EB\u30C0
bookmarksForm.edit=\u7DE8\u96C6
bookmarksForm.edit.tip=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u3092\u7DE8\u96C6
Modified: roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_nl.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_nl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_nl.properties Tue Mar 11 06:29:30 2014
@@ -75,7 +75,6 @@ bookmarksForm.addFolder=Nieuwe Folder
bookmarksForm.checkAll=Selecteer Alles
bookmarksForm.checkNone=Selecteer Niets
bookmarksForm.delete=Verwijder selectie
-bookmarksForm.description=
bookmarksForm.edit=Wijzig
bookmarksForm.edit.tip=Klik om deze favoriet te wijzigen.
bookmarksForm.folder=Folder
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Tue Mar 11 06:29:30 2014
@@ -54,7 +54,6 @@ bookmarksForm.addFolder=\u0414\u043e\u04
bookmarksForm.checkAll=\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0441\u0435
bookmarksForm.checkNone=\u0421\u043d\u044f\u0442\u044c \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435
bookmarksForm.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0435
-bookmarksForm.description=
bookmarksForm.folder=\u041f\u0430\u043f\u043a\u0430 \u0421\u0441\u044b\u043b\u043e\u043a
bookmarksForm.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
bookmarksForm.edit.tip=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0447\u0442\u043e\u0431\u044b \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Tue Mar 11 06:29:30 2014
@@ -83,7 +83,6 @@ bookmarksForm.checkAll=Izberi Vse
bookmarksForm.checkNone=Ni\u010Desar ne Izberi
bookmarksForm.delete=Izbri\u0161i izbrano
bookmarksForm.delete.confirm=Izbri\u0161em izbrane zaznamke?
-bookmarksForm.description=
bookmarksForm.folder=Imenik Zaznamka
bookmarksForm.priority=Priority
bookmarksForm.edit=urejanje
Modified: roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_vi.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_vi.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_vi.properties Tue Mar 11 06:29:30 2014
@@ -74,7 +74,6 @@ bookmarksForm.addFolder=Th\u00eam th\u01
bookmarksForm.checkAll=Ch\u1ecdn t\u1ea5t c\u1ea3
bookmarksForm.checkNone=Kh\u00f4ng ch\u1ecdn g\u00ec c\u1ea3
bookmarksForm.delete=X\u00f3a nh\u1eefng l\u1ef1a ch\u1ecdn
-bookmarksForm.description=
bookmarksForm.edit=So\u1ea1n
bookmarksForm.edit.tip=Nh\u1eafp chu\u1ed9t \u0111\u1ec3 so\u1ea1n th\u01b0 m\u1ee5c ho\u1eb7c th\u1ebb \u0111\u00e1nh d\u1ea5u
bookmarksForm.folder=Th\u01b0 m\u1ee5c
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Tue Mar 11 06:29:30 2014
@@ -40,7 +40,6 @@ bookmarksForm.addFolder=\u6dfb\u52a0\u4e
bookmarksForm.checkAll=\u5168\u90e8\u9009\u62e9
bookmarksForm.checkNone=\u4e00\u4e2a\u4e0d\u9009
bookmarksForm.delete=\u5220\u9664\u9009\u4e2d\u7684
-bookmarksForm.description=
bookmarksForm.edit=\u7f16\u8f91
bookmarksForm.edit.tip=\u70B9\u51FB\uFF0C\u7136\u540E\u7F16\u8F91\u6B64\u4E66\u7B7E
bookmarksForm.error.move=\u79fb\u52a8\u9519\u8bef\uff0c\u4e0d\u5141\u8bb8\u79fb\u52a8\u7236\u76ee\u5f55\u5230\u5b50\u76ee\u5f55
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties Tue Mar 11 06:29:30 2014
@@ -75,7 +75,6 @@ bookmarksForm.addFolder=\u65b0\u589e\u8c
bookmarksForm.checkAll=\u5168\u9078
bookmarksForm.checkNone=\u53cd\u9078\u53d6
bookmarksForm.delete=\u522a\u9664\u5df2\u9078\u64c7
-bookmarksForm.description=
bookmarksForm.edit=\u7de8\u8f2f
bookmarksForm.edit.tip=\u9ede\u9078\u6b64\u8655\u4ee5\u7de8\u8f2f\u6b64\u66f8\u7c64
bookmarksForm.folder=\u8cc7\u6599\u593e
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml Tue Mar 11 06:29:30 2014
@@ -7,7 +7,7 @@
class="org.apache.roller.weblogger.pojos.WeblogBookmark" access="PROPERTY">
<table name="bookmark"/>
<named-query name="BookmarkData.getByFolder">
- <query>SELECT b FROM WeblogBookmark b WHERE b.folder = ?1</query>
+ <query>SELECT b FROM WeblogBookmark b WHERE b.folder = ?1 order by b.priority</query>
</named-query>
<attributes>
<id name="id">
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml Tue Mar 11 06:29:30 2014
@@ -23,7 +23,7 @@
<join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
</many-to-one>
<one-to-many name="bookmarks" mapped-by="folder" target-entity="org.apache.roller.weblogger.pojos.WeblogBookmark" fetch="LAZY">
- <order-by>name</order-by>
+ <order-by>priority</order-by>
<cascade>
<cascade-persist />
<cascade-remove />
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd-validation.xml Tue Mar 11 06:29:30 2014
@@ -31,16 +31,6 @@
</field-validator>
</field>
- <field name="bean.priority">
- <field-validator type="required">
- <message key="Bookmark.error.priorityNull">unspecified key</message>
- </field-validator>
-
- <field-validator type="int">
- <message key="Bookmark.error.priorityNotInt">unspecified key</message>
- </field-validator>
- </field>
-
<field name="bean.image">
<field-validator type="url">
<message key="Bookmark.error.imageBad">unspecified key</message>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit-validation.xml Tue Mar 11 06:29:30 2014
@@ -31,16 +31,6 @@
</field-validator>
</field>
- <field name="bean.priority">
- <field-validator type="required">
- <message key="Bookmark.error.priorityNull">unspecified key</message>
- </field-validator>
-
- <field-validator type="int">
- <message key="Bookmark.error.priorityNotInt">unspecified key</message>
- </field-validator>
- </field>
-
<field name="bean.image">
<field-validator type="url">
<message key="Bookmark.error.imageBad">unspecified key</message>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Tue Mar 11 06:29:30 2014
@@ -55,11 +55,6 @@
<td><s:textfield name="bean.image" maxlength="255" size="70" /></td>
</tr>
- <tr>
- <td><s:text name="bookmarkForm.priority" /></td>
- <td><s:textfield name="bean.priority" maxlength="255" size="5" /></td>
- </tr>
-
</table>
<p>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Tue Mar 11 06:29:30 2014
@@ -58,11 +58,6 @@
<td><s:textfield name="bean.image" maxlength="255" size="70" /></td>
</tr>
- <tr>
- <td><s:text name="bookmarkForm.priority" /></td>
- <td><s:textfield name="bean.priority" maxlength="255" size="5" /></td>
- </tr>
-
</table>
<p>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Tue Mar 11 06:29:30 2014
@@ -90,10 +90,9 @@ function onMove()
<tr class="rHeaderTr">
<th class="rollertable" width="5%"><input name="control" type="checkbox" onclick="toggleFunctionAll(this.checked);"/></th>
- <th class="rollertable" width="5%"> </th>
- <th class="rollertable" width="30%"><s:text name="bookmarksForm.name" /></th>
- <th class="rollertable" width="45%"><s:text name="bookmarksForm.description" /></th>
- <th class="rollertable" width="5%"><s:text name="bookmarksForm.priority" /></th>
+ <th class="rollertable" width="25%"><s:text name="bookmarksForm.name" /></th>
+ <th class="rollertable" width="30%"><s:text name="bookmarksForm.url" /></th>
+ <th class="rollertable" width="30%"><s:text name="bookmarksForm.feedurl" /></th>
<th class="rollertable" width="5%"><s:text name="bookmarksForm.edit" /></th>
<th class="rollertable" width="5%"><s:text name="bookmarksForm.visitLink" /></th>
</tr>
@@ -113,20 +112,18 @@ function onMove()
<input type="checkbox" name="selectedBookmarks" value="<s:property value="#bookmark.id"/>" />
</td>
- <td class="rollertable" align="center"><img src='<s:url value="/images/link.png"/>' alt="icon" /></td>
-
<td class="rollertable">
<str:truncateNicely lower="25" upper="30" ><s:property value="#bookmark.name" /></str:truncateNicely>
</td>
<td class="rollertable">
- <str:truncateNicely lower="45" upper="55" ><s:property value="#bookmark.url" /></str:truncateNicely>
+ <str:truncateNicely lower="40" upper="50" ><s:property value="#bookmark.url" /></str:truncateNicely>
</td>
<td class="rollertable">
- <s:property value="#bookmark.priority" />
+ <str:truncateNicely lower="40" upper="50" ><s:property value="#bookmark.feedUrl" /></str:truncateNicely>
</td>
-
+
<td class="rollertable" align="center">
<s:url id="editUrl" action="bookmarkEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java?rev=1576198&r1=1576197&r2=1576198&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java Tue Mar 11 06:29:30 2014
@@ -101,9 +101,7 @@ public class BookmarkTest extends TestCa
"created by testBookmarkCRUD()",
"http://www.example.com",
"http://www.example.com/rss.xml",
- 12,
"test.jpg");
- bookmark1.setFolder(folder);
folder.addBookmark(bookmark1);
// Add another bookmark
@@ -113,9 +111,7 @@ public class BookmarkTest extends TestCa
"created by testBookmarkCRUD()",
"http://www.example.com",
"http://www.example.com/rss.xml",
- 12,
"test.jpf");
- bookmark2.setFolder(folder);
folder.addBookmark(bookmark2);
TestUtils.endSession(true);
@@ -179,17 +175,17 @@ public class BookmarkTest extends TestCa
WeblogBookmark b1 = new WeblogBookmark(
f1, "b1", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, "image.gif");
+ "image.gif");
bmgr.saveBookmark(b1);
WeblogBookmark b2 = new WeblogBookmark(
f1, "b2", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, "image.gif");
+ "image.gif");
bmgr.saveBookmark(b2);
WeblogBookmark b3 = new WeblogBookmark(
f2, "b3", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, "image.gif");
+ "image.gif");
bmgr.saveBookmark(b3);
TestUtils.endSession(true);
@@ -244,7 +240,7 @@ public class BookmarkTest extends TestCa
WeblogBookmark b1 = new WeblogBookmark(
f1, "b1", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, "image.gif");
+ "image.gif");
f1.addBookmark(b1);
// create folder f2 inside f1
@@ -255,7 +251,7 @@ public class BookmarkTest extends TestCa
WeblogBookmark b2 = new WeblogBookmark(
f2, "b2", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, "image.gif");
+ "image.gif");
f2.addBookmark(b2);
// create folder f3 inside folder f2
@@ -266,7 +262,7 @@ public class BookmarkTest extends TestCa
WeblogBookmark b3 = new WeblogBookmark(
f3, "b3", "testbookmark",
"http://example.com", "http://example.com/rss",
- 1, "image.gif");
+ "image.gif");
f3.addBookmark(b3);
TestUtils.endSession(true);