Changeset 263

Timestamp:

11/15/02 20:24:46 (21 years ago)

Author:

piso

Message:

NewsGroupSummaryMode? now extends MailboxMode?.

Location:

trunk/j/src/org/armedbear/j/mail

Files:

• MailboxMode.java (modified) (5 diffs)
• NewsGroupSummaryMode.java (modified) (3 diffs)

trunk/j/src/org/armedbear/j/mail/MailboxMode.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: MailboxMode.java,v 1.2 2002-10-03 17:40:26 piso Exp $
+ * $Id: MailboxMode.java,v 1.3 2002-11-15 20:23:09 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -23 +23 @@
 
 import java.awt.event.KeyEvent;
-import javax.swing.ButtonGroup;
 import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JRadioButtonMenuItem;
 import org.armedbear.j.AbstractMode;
 import org.armedbear.j.Buffer;
@@ -43 +41 @@
 import org.armedbear.j.View;
 
-public final class MailboxMode extends AbstractMode implements Constants, Mode
+public class MailboxMode extends AbstractMode implements Constants, Mode
 {
     private static final MailboxMode mode = new MailboxMode();
@@ -49 +47 @@
     private MailboxMode()
     {
-        super(MAILBOX_MODE, MAILBOX_MODE_NAME);
+        this(MAILBOX_MODE, MAILBOX_MODE_NAME);
+    }
+
+    protected MailboxMode(int id, String displayName)
+    {
+        super(id, displayName);
         setProperty(Property.VERTICAL_RULE, 0);
         setProperty(Property.SHOW_LINE_NUMBERS, false);
@@ -57 +60 @@
     }
 
-    public static final MailboxMode getMode()
+    public static Mode getMode()
     {
         return mode;

trunk/j/src/org/armedbear/j/mail/NewsGroupSummaryMode.java

@@ -3 +3 @@
  *
  * Copyright (C) 2000-2002 Peter Graves
- * $Id: NewsGroupSummaryMode.java,v 1.2 2002-11-15 17:35:47 piso Exp $
+ * $Id: NewsGroupSummaryMode.java,v 1.3 2002-11-15 20:24:46 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -23 +23 @@
 
 import java.awt.event.KeyEvent;
-import org.armedbear.j.AbstractMode;
-import org.armedbear.j.Buffer;
-import org.armedbear.j.Constants;
 import org.armedbear.j.Editor;
-import org.armedbear.j.Formatter;
+import org.armedbear.j.Frame;
 import org.armedbear.j.KeyMap;
-import org.armedbear.j.Line;
 import org.armedbear.j.Mode;
-import org.armedbear.j.Position;
-import org.armedbear.j.Property;
+import org.armedbear.j.NavigationComponent;
+import org.armedbear.j.ToolBar;
 
-public final class NewsGroupSummaryMode extends AbstractMode
-    implements Constants, Mode
+public final class NewsGroupSummaryMode extends MailboxMode
 {
-    private static final Mode mode = new NewsGroupSummaryMode();
+    private static final NewsGroupSummaryMode mode = new NewsGroupSummaryMode();
 
     private NewsGroupSummaryMode()
     {
         super(NEWS_GROUP_SUMMARY_MODE, NEWS_GROUP_SUMMARY_MODE_NAME);
-        setProperty(Property.VERTICAL_RULE, 0);
-        setProperty(Property.SHOW_LINE_NUMBERS, false);
-        setProperty(Property.SHOW_CHANGE_MARKS, false);
     }
 
@@ -52 +44 @@
     }
 
-    public final Formatter getFormatter(Buffer buffer)
+    public NavigationComponent getSidebarComponent(Editor editor)
     {
-        return new MailboxFormatter(buffer);
+        return null;
     }
 
     protected final void setKeyMapDefaults(KeyMap km)
     {
-        km.mapKey(KeyEvent.VK_ENTER, 0, "readArticle");
+        km.mapKey(KeyEvent.VK_ENTER, 0, "readArticleOtherWindow");
+        km.mapKey(KeyEvent.VK_ENTER, CTRL_MASK, "readArticle");
     }
 
-    public String getContextString(Editor editor, boolean verbose)
+    protected ToolBar getDefaultToolBar(Frame frame)
     {
-        Position dot = editor.getDot();
-        if (dot != null) {
-            final Line dotLine = dot.getLine();
-            if (dotLine instanceof MailboxLine) {
-                MailboxEntry entry = ((MailboxLine)dotLine).getMailboxEntry();
-                if (entry != null)
-                    return entry.getSubject();
-            }
-        }
-        return null;
+        return frame.getDefaultToolBar();
     }
 }