Changeset 1075

Timestamp:

06/14/16 10:52:44 (8 years ago)

Author:

davidb

Message:

Changes from private to protected to allow Browser to be inherited by another class, such as an experimental version of Expeditee using JFX events

File:

• trunk/src/org/expeditee/gui/Browser.java (modified) (7 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -87 +87 @@
         public static boolean _hasExited = false;
         
-        private MouseEventRouter _mouseEventRouter;
+        protected MouseEventRouter _mouseEventRouter;
 
         // A flag which is set once the application is exiting.
-        private boolean _isExiting = false;
-
-        private boolean _minimum_version6 = false;
+        protected boolean _isExiting = false;
+
+        protected boolean _minimum_version6 = false;
 
         public boolean isMinimumVersion6() {
@@ -98 +98 @@
         }
 
-        private static boolean _initComplete = false;
+        protected static boolean _initComplete = false;
         
-        private static String _startFrame = null;
+        protected static String _startFrame = null;
 
         /**
@@ -180 +180 @@
         }
 
-        private Browser() {
+        protected Browser() {
                 // center the frame on the screen
                 Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
@@ -213 +213 @@
             
             // set the layout to absolute layout for widgets
-                this.getContentPane().setLayout(new AbsoluteLayout());
+            // => this used to be done here, but now has been moved to later in the method
+            //    as is works better when put in a JFXPanel
+            //this.getContentPane().setLayout(new AbsoluteLayout());
 
                 _mouseEventRouter = new MouseEventRouter(getJMenuBar(),
@@ -227 +229 @@
                 addComponentListener(this);
                 pack();
+                this.getContentPane().setLayout(new AbsoluteLayout()); // moved to here to work with JFXPanel
 
                 // Reset windows to user specified size
@@ -375 +378 @@
          * @return
          */
-        private Frame loadProfile(String userName) {
+        protected Frame loadProfile(String userName) {
                 Frame profile = FrameIO.LoadProfile(userName);
                 if (profile == null) {
@@ -392 +395 @@
         public Graphics2D g;
 
-        private void setupGraphics() {
+        protected void setupGraphics() {
                 if (g != null)
                         g.dispose();