[jboss-cvs] JBossBlog SVN: r36 - in trunk: . blog-core/src/java/org/jboss/blog/model blog-core/src/java/org/jboss/blog/service/store/hibernate blog-core/src/java/org/jboss/blog/service/store/model blog-core/src/java/org/jboss/blog/tools blog-core/src/java/org/jboss/blog/ui blog-core/src/web blog-core/src/web/WEB-INF blog-core/src/web/views
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 4 17:37:53 EST 2006
Author: adamw
Date: 2006-12-04 17:37:40 -0500 (Mon, 04 Dec 2006)
New Revision: 36
Added:
trunk/blog-core/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java
trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java
Modified:
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java
trunk/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java
trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
trunk/blog-core/src/web/WEB-INF/faces-config.xml
trunk/blog-core/src/web/blog.css
trunk/blog-core/src/web/views/post_view.xhtml
trunk/jbossblog.iws
Log:
http://jira.jboss.com/jira/browse/JBBLOG-13
Added: trunk/blog-core/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java 2006-12-04 22:37:40 UTC (rev 36)
@@ -0,0 +1,21 @@
+package org.jboss.blog.model;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class BlogCommentDoesNotExistException extends Exception {
+ public BlogCommentDoesNotExistException() {
+ }
+
+ public BlogCommentDoesNotExistException(String message) {
+ super(message);
+ }
+
+ public BlogCommentDoesNotExistException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public BlogCommentDoesNotExistException(Throwable cause) {
+ super(cause);
+ }
+}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java 2006-12-04 22:37:40 UTC (rev 36)
@@ -3,6 +3,8 @@
import org.jboss.blog.service.store.model.ModifiableBlogPost;
import org.jboss.blog.service.store.model.ModifiableBlogComment;
import org.jboss.blog.model.AbstractBlogPost;
+import org.jboss.blog.model.BlogComment;
+import org.jboss.blog.model.BlogCommentDoesNotExistException;
import org.jboss.blog.tools.BlogTools;
import java.util.*;
@@ -150,9 +152,12 @@
storeService.addComment(this, hcomment);
}
- public void removeComment(ModifiableBlogComment comment) throws IllegalArgumentException {
- HibernateBlogStoreService storeService = getStoreService();
+ public ModifiableBlogComment getModifiableBlogComment(BlogComment comment)
+ throws BlogCommentDoesNotExistException {
+ if (!(comment instanceof HBlogComment)) {
+ throw new BlogCommentDoesNotExistException(comment.getTitle());
+ }
- storeService.deleteComment(comment);
+ return (ModifiableBlogComment) comment;
}
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java 2006-12-04 22:37:40 UTC (rev 36)
@@ -1,6 +1,8 @@
package org.jboss.blog.service.store.model;
import org.jboss.blog.model.BlogPost;
+import org.jboss.blog.model.BlogComment;
+import org.jboss.blog.model.BlogCommentDoesNotExistException;
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
@@ -21,13 +23,13 @@
throws IllegalArgumentException;
/**
- * Removes the given comment from this blog post. This method should be used
- * instead of modifying the {@link ModifiableBlogPost#getComments()}
- * list.
- * @param comment Post to remove.
- * @throws IllegalArgumentException If either comment is null, or
- * it hasn't been obtained in a proper way.
+ * Given a blog comment, gets a modifiable version of the same blog
+ * comment.
+ * @param comment Comment for which to get a modifiable version.
+ * @return A modifiable version of the given blog comment.
+ * @throws BlogCommentDoesNotExistException If the blog comment is not
+ * modifiable.
*/
- public void removeComment(ModifiableBlogComment comment)
- throws IllegalArgumentException;
+ public ModifiableBlogComment getModifiableBlogComment(BlogComment comment)
+ throws BlogCommentDoesNotExistException;
}
Modified: trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2006-12-04 22:37:40 UTC (rev 36)
@@ -20,6 +20,8 @@
public static final String POST_NEW = "post_new";
public static final String POST_DEL = "post_del";
+ public static final String COMMENT_DEL = "comment_del";
+
public static final String ADMIN_PANEL = "admin_panel";
public static final String ID_EDIT = "id_edit";
@@ -40,4 +42,8 @@
public static void addMessagePostDoesntExist(String id) {
addErrorMessage("The post you requested: " + id + " does not exist.");
}
+
+ public static void addMessageCommentDoesntExist() {
+ addErrorMessage("The comment you requested does not exist.");
+ }
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2006-12-04 22:37:40 UTC (rev 36)
@@ -26,7 +26,6 @@
// Faces-managed properties
private UIData postsData;
- private UIData commentsData;
private State state;
public UIData getPostsData() {
@@ -37,14 +36,6 @@
this.postsData = postsData;
}
- public UIData getCommentsData() {
- return commentsData;
- }
-
- public void setCommentsData(UIData commentsData) {
- this.commentsData = commentsData;
- }
-
public State getState() {
return state;
}
Added: trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java 2006-12-04 22:37:40 UTC (rev 36)
@@ -0,0 +1,128 @@
+package org.jboss.blog.ui;
+
+import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.UITools;
+import org.jboss.blog.service.store.model.ModifiableBlogModel;
+import org.jboss.blog.service.store.model.ModifiableBlogPost;
+import org.jboss.blog.service.store.model.ModifiableBlogComment;
+import org.jboss.blog.model.*;
+
+import javax.faces.component.UIData;
+import java.util.*;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class CommentEdit {
+ private BlogView blogView;
+ private UIData commentsData;
+
+ private String title;
+ private String author;
+ private String description;
+
+ public CommentEdit() {
+
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public BlogView getBlogView() {
+ return blogView;
+ }
+
+ public void setBlogView(BlogView blogView) {
+ this.blogView = blogView;
+ }
+
+ public UIData getCommentsData() {
+ return commentsData;
+ }
+
+ public void setCommentsData(UIData commentsData) {
+ this.commentsData = commentsData;
+ }
+
+ // Actions
+
+ private ModifiableBlogPost getPost() throws BlogPostDoesNotExistException,
+ BlogModelDoesNotExistException {
+ ModifiableBlogModel model = BlogTools.getBlogService().getStoreService().getBlogModel(
+ blogView.getBlogName());
+ return model.getModifiableBlogPostByTitleAsId(
+ blogView.getSelectedPostTitleAsId());
+ }
+
+ public String saveNew() {
+ try {
+ ModifiableBlogComment comment;
+
+ comment = BlogTools.getBlogService().getStoreService().newBlogComment();
+
+ comment.setAuthor(author);
+
+ comment.setTitle(title);
+ comment.setDescription(description);
+ comment.setCreated(new Date());
+
+ ModifiableBlogPost post = getPost();
+
+ post.addComment(comment);
+
+ UITools.addInfoMessage("New comment saved.");
+ } catch (BlogModelDoesNotExistException e) {
+ UITools.addMessageBlogDoesntExist(blogView.getBlogName());
+ } catch (BlogPostDoesNotExistException e) {
+ UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
+ }
+
+ return null;
+ }
+
+ public String delete() {
+ try {
+ ModifiableBlogPost post = getPost();
+ BlogComment notModifiableComment = (BlogComment) commentsData.getRowData();
+ ModifiableBlogComment comment = post.getModifiableBlogComment(notModifiableComment);
+
+ BlogTools.getBlogService().getStoreService().deleteComment(comment);
+
+ UITools.addInfoMessage("Comment deleted.");
+ } catch (BlogModelDoesNotExistException e) {
+ UITools.addMessageBlogDoesntExist(blogView.getBlogName());
+ } catch (BlogPostDoesNotExistException e) {
+ UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
+ } catch (BlogCommentDoesNotExistException e) {
+ UITools.addMessageCommentDoesntExist();
+ }
+
+ return UITools.POST_VIEW;
+
+ }
+
+ public String back() {
+ return blogView.getReturnTo();
+ }
+}
Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-12-04 22:37:40 UTC (rev 36)
@@ -66,6 +66,16 @@
</managed-bean>
<managed-bean>
+ <managed-bean-name>commentEdit</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.CommentEdit</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>blogView</property-name>
+ <value>#{blogView}</value>
+ </managed-property>
+ </managed-bean>
+
+ <managed-bean>
<managed-bean-name>state</managed-bean-name>
<managed-bean-class>org.jboss.blog.ui.State</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
Modified: trunk/blog-core/src/web/blog.css
===================================================================
--- trunk/blog-core/src/web/blog.css 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/web/blog.css 2006-12-04 22:37:40 UTC (rev 36)
@@ -54,4 +54,12 @@
.sidenote {
font-size: 10px;
+}
+
+.empty {
+
+}
+
+.column-top {
+ vertical-align: text-top;
}
\ No newline at end of file
Modified: trunk/blog-core/src/web/views/post_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_view.xhtml 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/blog-core/src/web/views/post_view.xhtml 2006-12-04 22:37:40 UTC (rev 36)
@@ -41,9 +41,11 @@
<h3>Comments</h3>
+ <h:form>
<h:dataTable value="#{blogView.selectedPost.comments}" var="comment"
- binding="#{blogView.commentsData}" styleClass="posts"
- rowClasses="posts-row,posts-row-alternate" >
+ binding="#{commentEdit.commentsData}" styleClass="posts"
+ rowClasses="posts-row,posts-row-alternate"
+ columnClasses="empty,column-top">
<h:column>
<span class="post-title">#{comment.title}</span>
<span class="post-data">
@@ -68,6 +70,7 @@
</h:panelGroup>
</h:column>
</h:dataTable>
+ </h:form>
</blog:isAllowed>
</h:panelGroup>
@@ -91,13 +94,18 @@
maxlength="255" size="32" />
</h:panelGroup>
- <h:panelGroup>Description:</h:panelGroup>
+ <h:panelGroup>Description: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputTextarea value="#{commentEdit.description}" rows="10" cols="40" />
+ <h:inputTextarea value="#{commentEdit.description}"
+ rows="10" cols="40" required="true" />
</h:panelGroup>
</h:panelGrid>
<h:commandLink value="Add" action="#{commentEdit.saveNew}" />
+
+ <p class="sidenote">
+ Fields marked with (*) are required. <ui:insert name="sidenotes" />
+ </p>
</h:form>
<hr />
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2006-12-03 00:10:53 UTC (rev 35)
+++ trunk/jbossblog.iws 2006-12-04 22:37:40 UTC (rev 36)
@@ -18,12 +18,14 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPost.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/blog.css" afterPath="$PROJECT_DIR$/blog-core/src/web/blog.css" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -150,61 +152,96 @@
<leaf>
<file leaf-file-name="post_view.xhtml" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="47" column="52" selection-start="1877" selection-end="1877" vertical-scroll-proportion="0.23154363">
+ <folding />
+ </state>
+ </provider>
<provider editor-type-id="HtmlPreview">
<state />
</provider>
+ </entry>
+ </file>
+ <file leaf-file-name="blog.css" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="18" selection-start="1540" selection-end="1540" vertical-scroll-proportion="-0.25838926">
+ <state line="63" column="29" selection-start="753" selection-end="753" vertical-scroll-proportion="1.1623794">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AbstractBlogPost.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java">
+ <file leaf-file-name="CommentEdit.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="66" selection-start="495" selection-end="495" vertical-scroll-proportion="0.3376206">
+ <state line="68" column="5" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.19292605">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="BlogView.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="36" column="5" selection-start="984" selection-end="984" vertical-scroll-proportion="-4.869775">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HBlogPost.hbm.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml">
+ <file leaf-file-name="ModifiableBlogComment.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogComment.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="9" selection-start="1173" selection-end="1173" vertical-scroll-proportion="0.79581994">
+ <state line="7" column="71" selection-start="225" selection-end="225" vertical-scroll-proportion="0.1688103">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HBlogComment.hbm.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml">
+ <file leaf-file-name="faces-config.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="15" selection-start="525" selection-end="525" vertical-scroll-proportion="0.3376206">
+ <state line="68" column="32" selection-start="2584" selection-end="2584" vertical-scroll-proportion="0.55421686">
<folding />
</state>
</provider>
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+ <state />
+ </provider>
</entry>
</file>
- <file leaf-file-name="HibernateBlogStoreService.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
+ <file leaf-file-name="AbstractBlogPost.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="316" column="30" selection-start="10929" selection-end="10929" vertical-scroll-proportion="0.49588138">
+ <state line="14" column="66" selection-start="495" selection-end="495" vertical-scroll-proportion="0.3376206">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PostEdit.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java">
+ <file leaf-file-name="HBlogPost.hbm.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="16" column="13" selection-start="520" selection-end="520" vertical-scroll-proportion="-4.822076">
+ <state line="33" column="9" selection-start="1173" selection-end="1173" vertical-scroll-proportion="0.79581994">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="HBlogComment.hbm.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="14" column="15" selection-start="525" selection-end="525" vertical-scroll-proportion="0.3376206">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -608,6 +645,48 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jbossblog.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -775,7 +854,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -812,16 +891,6 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager">
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
- </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -834,6 +903,23 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="" />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -853,13 +939,6 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
</component>
<component name="ScopeViewComponent">
<subPane subId="Project">
@@ -938,7 +1017,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1690" height="1004" extended-state="6" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
@@ -947,7 +1026,7 @@
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26118946" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32839224" order="1" />
<window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24367674" order="7" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22690992" order="9" />
+ <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22690992" order="9" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39977092" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
@@ -1056,125 +1135,130 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="9" selection-start="1173" selection-end="1173" vertical-scroll-proportion="0.79581994">
+ <state line="91" column="40" selection-start="3490" selection-end="3490" vertical-scroll-proportion="0.48913044">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-permissions.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.2224109">
+ <state line="22" column="44" selection-start="853" selection-end="853" vertical-scroll-proportion="0.37037036">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="142" column="62" selection-start="3504" selection-end="3504" vertical-scroll-proportion="0.2210145">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPost.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="24" column="27" selection-start="565" selection-end="565" vertical-scroll-proportion="0.5546624">
+ <state line="14" column="66" selection-start="495" selection-end="495" vertical-scroll-proportion="0.3376206">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="61" selection-start="394" selection-end="394" vertical-scroll-proportion="0.2170418">
+ <state line="152" column="5" selection-start="3620" selection-end="3620" vertical-scroll-proportion="0.692029">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="155" column="35" selection-start="3933" selection-end="3933" vertical-scroll-proportion="0.38906753">
+ <state line="46" column="50" selection-start="1718" selection-end="1718" vertical-scroll-proportion="0.7789855">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="0" selection-start="1018" selection-end="1018" vertical-scroll-proportion="0.51446944">
+ <state line="36" column="5" selection-start="984" selection-end="984" vertical-scroll-proportion="-4.869775">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="91" column="49" selection-start="3926" selection-end="3926" vertical-scroll-proportion="-0.049423393">
+ <state line="68" column="32" selection-start="2584" selection-end="2584" vertical-scroll-proportion="0.55421686">
<folding />
</state>
</provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
- <provider editor-type-id="HtmlPreview">
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
<state />
</provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="53" selection-start="2106" selection-end="2106" vertical-scroll-proportion="0.30981067">
+ <state line="68" column="5" selection-start="1465" selection-end="1465" vertical-scroll-proportion="0.19292605">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="33" column="9" selection-start="1173" selection-end="1173" vertical-scroll-proportion="0.79581994">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_edit.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="1" selection-start="695" selection-end="695" vertical-scroll-proportion="0.8553055">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
<provider editor-type-id="HtmlPreview">
<state />
</provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_new.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="39" selection-start="2581" selection-end="2581" vertical-scroll-proportion="0.42114094">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_new.xhtml">
<provider editor-type-id="HtmlPreview">
<state />
</provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="79" selection-start="634" selection-end="693" vertical-scroll-proportion="0.45302013">
+ <state line="64" column="16" selection-start="2836" selection-end="2965" vertical-scroll-proportion="0.59731543">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="66" selection-start="759" selection-end="759" vertical-scroll-proportion="0.37067544">
+ <state line="63" column="29" selection-start="753" selection-end="753" vertical-scroll-proportion="1.1623794">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="66" selection-start="495" selection-end="495" vertical-scroll-proportion="0.3376206">
+ <state line="47" column="52" selection-start="1877" selection-end="1877" vertical-scroll-proportion="0.23154363">
<folding />
</state>
</provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
<provider editor-type-id="HtmlPreview">
<state />
</provider>
- <provider selected="true" editor-type-id="text-editor">
- <state line="39" column="18" selection-start="1540" selection-end="1540" vertical-scroll-proportion="-0.25838926">
- <folding />
- </state>
- </provider>
</entry>
</component>
</project>
More information about the jboss-cvs-commits
mailing list