Changeset 14805

Timestamp:

06/29/08 01:01:05 (5 years ago)

Author:

todogzm

Message:

登録内容一覧、BookmarkablePagelinkのタイトル動的表示対応、TextArea表示内容の改行表示対応。

Location:

lang/java/Wicketropy/trunk/src

Files:

• main/java/jp/dip/todo/wicket/tropy/BasePage.html (modified) (1 diff)
• main/java/jp/dip/todo/wicket/tropy/BasePage.java (modified) (2 diffs)
• main/java/jp/dip/todo/wicket/tropy/EntryPage.java (modified) (2 diffs)
• main/java/jp/dip/todo/wicket/tropy/service/Service.java (modified) (2 diffs)
• main/java/jp/dip/todo/wicket/tropy/service/ServiceImpl.java (modified) (2 diffs)
• test/java/jp/dip/todo/wicket/tropy/TestHomePage.java (modified) (1 diff)

lang/java/Wicketropy/trunk/src/main/java/jp/dip/todo/wicket/tropy/BasePage.html

@@ -34 +34 @@
  <div id="firstSide" class="sidebar">
   <h4>サイドバータイトル</h4>
-  <ul>
-   <li><a href="#" class="lists">リスト</a></li>
-   <li><a href="#" class="lists">リスト</a></li>
-   <li><a href="#" class="lists">リスト</a></li>
-   <li><a href="#" class="lists">リスト</a></li>
-   <li><a href="#" class="lists">リスト</a></li>
+  <ul wicket:id="recentEntries">
+   <li><a class="lists" wicket:id="recentLink"></a></li>
   </ul>
  </div>

lang/java/Wicketropy/trunk/src/main/java/jp/dip/todo/wicket/tropy/BasePage.java

@@ -15 +15 @@
  *  under the License.
  */
-
 package jp.dip.todo.wicket.tropy;
 
+import com.google.inject.Inject;
+import jp.dip.todo.wicket.tropy.model.TropyEntry;
+import jp.dip.todo.wicket.tropy.service.Service;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 
 /**
@@ -26 +35 @@
 public class BasePage extends WebPage {
 
+        @Inject
+        private Service service;
+
+        public BasePage() {
+                add(new ListView("recentEntries", service.getRecentEntries(5)) {
+
+                        @Override
+                        protected void populateItem(ListItem item) {
+                                final TropyEntry entry = (TropyEntry) item.getModel().getObject();
+                                Link link = new BookmarkablePageLink("recentLink",
+                                                EntryPage.class,
+                                                new PageParameters("id=" + entry.getId())) {
+                                        @Override
+                                        protected void onComponentTagBody(MarkupStream arg0, ComponentTag arg1) {
+                                                replaceComponentTagBody(arg0, arg1, entry.getTitle());
+                                        }
+                                };
+                                item.add(link);
+//                              item.add(new Label("recentTitle", entry.getTitle()));
+                        }
+                });
+        }
 }

lang/java/Wicketropy/trunk/src/main/java/jp/dip/todo/wicket/tropy/EntryPage.java

@@ -26 +26 @@
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.basic.MultiLineLabel;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.slf4j.Logger;
@@ -55 +56 @@
                 add(new Label("id", String.valueOf(tropyId)));
                 add(new Label("title", entry.getTitle()));
-                add(new Label("body", entry.getBody()));
+                add(new MultiLineLabel("body", entry.getBody()));
                 add(new Label("timestamp", (timestamp != null) ? timestamp.toString() : ""));
                 add(new BookmarkablePageLink("editPage", EditPage.class, new PageParameters("id=" + tropyId)));

lang/java/Wicketropy/trunk/src/main/java/jp/dip/todo/wicket/tropy/service/Service.java

@@ -19 +19 @@
 
 import com.google.inject.ImplementedBy;
+import java.util.List;
 import jp.dip.todo.wicket.tropy.model.TropyEntry;
 
@@ -37 +38 @@
 
         public void putTropyEntry(TropyEntry tropy) throws TropyException;
+        
+        public List<TropyEntry> getRecentEntries(int maxNum);
 }

lang/java/Wicketropy/trunk/src/main/java/jp/dip/todo/wicket/tropy/service/ServiceImpl.java

@@ -26 +26 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Date;
+import java.util.List;
 import java.util.Random;
 import jp.dip.todo.wicket.tropy.WicketApplication;
@@ -136 +140 @@
                 return rand.nextInt(MAX_ID) + 1;
         }
+
+        public List<TropyEntry> getRecentEntries(int maxNum) {
+                File[] entries = folder.listFiles();
+                Arrays.sort(entries, new Comparator<File>() {
+                        @Override
+                        public int compare(File o1, File o2) {
+                                return (int)(o2.lastModified() - o1.lastModified());
+                        }
+                });
+                
+                File[] recents = Arrays.copyOfRange(entries, 0, Math.min(maxNum, entries.length));
+                
+                List<TropyEntry> result = new ArrayList<TropyEntry>(recents.length);
+                for (File entry : recents) {
+                        result.add(getTropyEntry(entry));
+                }
+                
+                return result;
+        }
 }

lang/java/Wicketropy/trunk/src/test/java/jp/dip/todo/wicket/tropy/TestHomePage.java

@@ -64 +64 @@
                 tester.assertRenderedPage(EntryPage.class);
                 tester.assertLabel("title", "title-8888");
-                tester.assertLabel("body", "8 8 8 8\n");
+                tester.assertModelValue("body", "8 8 8 8\n");
         }