Changeset 91

Timestamp:

10/11/02 01:04:28 (21 years ago)

Author:

piso

Message:

• Cleaned up constructors (there's only one now).
• Made display, dispatcher and frame fields final.

File:

• trunk/j/src/org/armedbear/j/Editor.java (modified) (7 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: Editor.java,v 1.5 2002-10-10 16:34:10 piso Exp $
+ * $Id: Editor.java,v 1.6 2002-10-11 01:04:28 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -122 +122 @@
     private Buffer buffer;
 
-    private Display display;
-
-    private Dispatcher dispatcher;
+    private final Display display;
+    private final Dispatcher dispatcher;
+    private final Frame frame;
 
     private Search lastSearch;
@@ -169 +169 @@
 
     private JPopupMenu popup;
-
-    private Frame frame;
 
     private static SystemSelection systemSelection;
@@ -362 +360 @@
         tagFileManager = new TagFileManager();
 
-        setCurrentEditor(new Editor());
+        setCurrentEditor(new Editor(null));
 
         currentEditor.getFrame().updateControls();
@@ -475 +473 @@
     }
 
-    public Editor()
-    {
+    public Editor(Frame f)
+    {
+        display = new Display(this);
+        dispatcher = new Dispatcher(this);
         init();
-        frame = new Frame(this);
-    }
-
-    public Editor(Frame frame)
-    {
-        init();
-        this.frame = frame;
+        frame = f != null ? f : new Frame(this);
     }
 
@@ -495 +489 @@
 
         setLayout(new BorderLayout());
-        display = new Display(this);
         display.setDoubleBuffered(true);
         add(display, BorderLayout.CENTER);
-
-        dispatcher = new Dispatcher(this);
 
         new DropTarget(display, dispatcher);
@@ -782 +773 @@
     public static Editor createNewFrame()
     {
-        Editor ed = new Editor();
+        Editor ed = new Editor(null);
         ed.getFrame().updateControls();
         ed.getFrame().placeWindow();