[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs ...
Christian Bauer
christian at hibernate.org
Tue Dec 18 23:29:27 EST 2007
User: cbauer
Date: 07/12/18 23:29:27
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs
CommentsPreferences.java WikiPreferences.java
Log:
Major rewrite of the most of the application
Revision Changes Path
1.4 +10 -1 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CommentsPreferences.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CommentsPreferences.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/CommentsPreferences.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CommentsPreferences.java 24 Sep 2007 08:23:21 -0000 1.3
+++ CommentsPreferences.java 19 Dec 2007 04:29:27 -0000 1.4
@@ -3,6 +3,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Observer;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.ScopeType;
import org.jboss.seam.wiki.preferences.Preference;
import org.jboss.seam.wiki.preferences.PreferenceVisibility;
@@ -13,6 +14,7 @@
@Name("commentsPreferences")
@Scope(ScopeType.CONVERSATION)
@Preference(description = "Core: Visitor Comments", visibility = PreferenceVisibility.USER)
+ at AutoCreate
public class CommentsPreferences extends PreferenceSupport implements Serializable {
public String getCurrentUserVariable() { return "currentUser"; }
@@ -21,12 +23,15 @@
@Observer("PreferenceEditor.refresh.commentsPreferences")
public void refreshProperties() { super.refreshProperties(); }
- @Preference(description = "01. List comments ascending by date (or descending)", visibility = PreferenceVisibility.USER)
+ @Preference(description = "01. List flat comments ascending by date (or descending)", visibility = PreferenceVisibility.SYSTEM)
private Boolean listAscending;
@Preference(description = "02. Enable comments by default", visibility = PreferenceVisibility.USER)
private Boolean enableByDefault;
+ @Preference(description = "03. Threaded comments (or flat)", visibility = PreferenceVisibility.SYSTEM)
+ private Boolean threadedComments;
+
public Boolean getListAscending() {
return listAscending;
}
@@ -34,4 +39,8 @@
public Boolean getEnableByDefault() {
return enableByDefault;
}
+
+ public Boolean getThreadedComments() {
+ return threadedComments;
+ }
}
1.13 +34 -23 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WikiPreferences.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- WikiPreferences.java 14 Nov 2007 08:12:26 -0000 1.12
+++ WikiPreferences.java 19 Dec 2007 04:29:27 -0000 1.13
@@ -40,57 +40,63 @@
@NotNull
private String themeName;
- @Preference(description = "04. Identifier of member area (home directories)", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "04. Wiki area for user home directorie", visibility = PreferenceVisibility.SYSTEM)
+ @Length(min = 3, max = 1000)
@NotNull
- private Long memberAreaId;
+ private String memberArea;
+
+ @Preference(description = "05. Wiki area containing help texts", visibility = PreferenceVisibility.SYSTEM)
+ @Length(min = 3, max = 1000)
+ @NotNull
+ private String helpArea;
- @Preference(description = "05. Identifier of the default start document of the Wiki", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "06. Identifier of the default start document of the Wiki", visibility = PreferenceVisibility.SYSTEM)
@NotNull
private Long defaultDocumentId;
- @Preference(description = "06. Render all links as permanent numeric identifier links (or as /Wiki/WordLinks)", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "07. Render all links as permanent numeric identifier links (or as /Wiki/WordLinks)", visibility = PreferenceVisibility.SYSTEM)
private Boolean renderPermlinks;
- @Preference(description = "07. Append this suffix to permanent identifier", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "08. Append this suffix to permanent identifier", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 2, max = 20)
@org.hibernate.validator.Pattern(regex="\\.[a-zA-z]+")
@NotNull
private String permlinkSuffix;
- @Preference(description = "08. Purge feed entries after N days", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "09. Feed title prefix", visibility = PreferenceVisibility.SYSTEM)
+ @Length(min = 0, max = 255)
+ @NotNull
+ private String feedTitlePrefix;
+
+ @Preference(description = "10. Purge feed entries after N days", visibility = PreferenceVisibility.SYSTEM)
@Range(min = 1l, max = 999l)
@NotNull
private Long purgeFeedEntriesAfterDays;
- @Preference(description = "09. Replace @ symbol in e-mail addresses with", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "11. Replace @ symbol in e-mail addresses with", visibility = PreferenceVisibility.SYSTEM)
@Length(min = 1, max = 20)
@NotNull
private String atSymbolReplacement;
- @Preference(description = "10. Flatten main menu to levels", visibility = PreferenceVisibility.SYSTEM)
- @Range(min = 1l, max = 5l)
+ @Preference(description = "12. Flatten main menu to levels (set to 0 for unlimited visible levels)", visibility = PreferenceVisibility.SYSTEM)
+ @Range(min = 0l, max = 10l)
@NotNull
private Long mainMenuLevels;
- @Preference(description = "11. Maximum depth of main menu nodes", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "13. Maximum depth of main menu nodes", visibility = PreferenceVisibility.SYSTEM)
@Range(min = 1l, max = 99l)
@NotNull
private Long mainMenuDepth;
- @Preference(description = "12. Show only nodes owned by system administrator in main menu", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "14. Show only nodes owned by system administrator in main menu", visibility = PreferenceVisibility.SYSTEM)
private Boolean mainMenuShowAdminOnly;
- @Preference(description = "13. Show document creator/edit history in document footer", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "15. Show document creator/edit history in document footer", visibility = PreferenceVisibility.SYSTEM)
private Boolean showDocumentCreatorHistory;
- @Preference(description = "14. Show document tags in document footer", visibility = PreferenceVisibility.SYSTEM)
+ @Preference(description = "16. Show document tags in document footer", visibility = PreferenceVisibility.SYSTEM)
private Boolean showTags;
- @Preference(description = "15. Wiki area containing help texts", visibility = PreferenceVisibility.SYSTEM)
- @Length(min = 3, max = 1000)
- @NotNull
- private String helpArea;
-
public String getBaseUrl() {
return baseUrl;
}
@@ -103,8 +109,12 @@
return themeName;
}
- public Long getMemberAreaId() {
- return memberAreaId;
+ public String getMemberArea() {
+ return memberArea;
+ }
+
+ public String getHelpArea() {
+ return helpArea;
}
public Long getDefaultDocumentId() {
@@ -119,6 +129,10 @@
return permlinkSuffix;
}
+ public String getFeedTitlePrefix() {
+ return feedTitlePrefix;
+ }
+
public Long getPurgeFeedEntriesAfterDays() {
return purgeFeedEntriesAfterDays;
}
@@ -147,7 +161,4 @@
return showTags;
}
- public String getHelpArea() {
- return helpArea;
- }
}
More information about the jboss-cvs-commits
mailing list