Changeset 18

Timestamp:

10/02/02 02:10:22 (20 years ago)

Author:

piso

Message:

REORDER_BUFFERS is now an integer property.

Location:

trunk/j/src/org/armedbear/j

Files:

• BufferList.java (modified) (9 diffs)
• Property.java (modified) (3 diffs)

trunk/j/src/org/armedbear/j/BufferList.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: BufferList.java,v 1.1.1.1 2002-09-24 16:09:14 piso Exp $
+ * $Id: BufferList.java,v 1.2 2002-10-02 02:10:22 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -31 +31 @@
     private final ArrayList list = new ArrayList();
 
-    private boolean sort;
+    private boolean alpha; // Sort alphabetically?
     private boolean reorder;
     private boolean modified;
@@ -39 +39 @@
         Preferences p = Editor.preferences();
         if (p != null) {
-            sort = p.getBooleanProperty(Property.SORT_BUFFER_LIST);
-            reorder = p.getBooleanProperty(Property.REORDER_BUFFERS) && !sort;
+            alpha = p.getBooleanProperty(Property.SORT_BUFFER_LIST);
+            if (alpha)
+                reorder = false;
+            else
+                reorder = p.getIntegerProperty(Property.REORDER_BUFFERS) > 0;
             p.addPreferencesChangeListener(this);
         } else
@@ -48 +51 @@
     public synchronized Iterator iterator()
     {
-        if (sort && modified)
+        if (alpha && modified)
             sort();
         return list.iterator();
@@ -77 +80 @@
     {
         if (list.size() > 0) {
-            if (sort && modified)
+            if (alpha && modified)
                 sort();
             return (Buffer) list.get(0);
@@ -86 +89 @@
     public synchronized Buffer getNextPrimaryBuffer(Buffer buffer)
     {
-        if (sort && modified)
+        if (alpha && modified)
             sort();
         if (buffer.isSecondary()) {
@@ -113 +116 @@
     public synchronized Buffer getPreviousPrimaryBuffer(Buffer buffer)
     {
-        if (sort && modified)
+        if (alpha && modified)
             sort();
         if (buffer.isSecondary()) {
@@ -221 +224 @@
         Preferences p = Editor.preferences();
         boolean b = p.getBooleanProperty(Property.SORT_BUFFER_LIST);
-        if (b != sort) {
-            sort = b;
-            if (sort) {
+        if (b != alpha) {
+            alpha = b;
+            if (alpha) {
                 sort();
                 Sidebar.setUpdateFlagInAllFrames(SIDEBAR_BUFFER_LIST_CHANGED);
             }
         }
-        reorder = p.getBooleanProperty(Property.REORDER_BUFFERS) && !sort;
+        if (alpha)
+            reorder = false;
+        else
+            reorder = p.getIntegerProperty(Property.REORDER_BUFFERS) > 0;
     }
 
@@ -244 +250 @@
     private void sort()
     {
-        if (sort) {
+        if (alpha) {
             if (comparator == null) {
                 comparator = new Comparator() {

trunk/j/src/org/armedbear/j/Property.java

@@ -3 +3 @@
  *
  * Copyright (C) 2000-2002 Peter Graves
- * $Id: Property.java,v 1.2 2002-09-25 13:31:42 piso Exp $
+ * $Id: Property.java,v 1.3 2002-10-02 02:09:49 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -59 +59 @@
     public static final Property PRINTER_FONT_SIZE =
         createProperty("printerFontSize", 10);
+    public static final Property REORDER_BUFFERS =
+        createProperty("reorderBuffers", 1);
     public static final Property SHELL_OUTPUT_LIMIT =
         createProperty("shellOutputLimit", 1000);
@@ -161 +163 @@
     public static final Property POP_KEEP_MESSAGES_ON_SERVER =
         createProperty("popKeepMessagesOnServer", true);
-    public static final Property REORDER_BUFFERS =
-        createProperty("reorderBuffers", true);
     public static final Property REMOVE_TRAILING_WHITESPACE =
         createProperty("removeTrailingWhitespace", false);