Code refactoring.

[sixth-3d.git] / src / main / java / eu / svjatoslav / sixth / e3d / gui / GuiComponent.java

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/GuiComponent.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/GuiComponent.java
index 8ab5c90..70350e0 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/GuiComponent.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/GuiComponent.java
@@ -11,10 +11,10 @@ package eu.svjatoslav.sixth.e3d.gui;
 
 import eu.svjatoslav.sixth.e3d.geometry.Box;
 import eu.svjatoslav.sixth.e3d.geometry.Point3D;
-import eu.svjatoslav.sixth.e3d.math.Transform;
 import eu.svjatoslav.sixth.e3d.gui.humaninput.MouseInteractionController;
 import eu.svjatoslav.sixth.e3d.gui.humaninput.UserInputHandler;
 import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.KeyboardHelper;
+import eu.svjatoslav.sixth.e3d.math.Transform;
 import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.basic.line.LineAppearance;
 import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite.base.AbstractCompositeShape;
 import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite.wireframe.WireframeBox;
@@ -25,21 +25,21 @@ public class GuiComponent extends AbstractCompositeShape implements
         UserInputHandler, MouseInteractionController {
 
     private static final String GROUP_GUI_FOCUS = "gui.focus";
-    public final ViewContext viewContext;
+    public final ViewPanel viewPanel;
     Box containingBox = new Box();
     private WireframeBox borders = null;
 
     private boolean borderShown = false;
 
     public GuiComponent(final Transform transform,
-                        final ViewContext viewContext, final Point3D size) {
+                        final ViewPanel viewPanel, final Point3D size) {
         super(transform);
-        this.viewContext = viewContext;
+        this.viewPanel = viewPanel;
         setDimensions(size);
     }
 
     @Override
-    public boolean beforeRender(final ViewContext viewContext,
+    public boolean beforeRender(final ViewPanel viewPanel,
                                 final int millisecondsSinceLastFrame) {
         return false;
     }
@@ -56,13 +56,15 @@ public class GuiComponent extends AbstractCompositeShape implements
     }
 
     @Override
-    public void focusLost(final ViewContext viewContext) {
+    public boolean focusLost(final ViewPanel viewPanel) {
         hideBorder();
+        return true;
     }
 
     @Override
-    public void focusReceived(final ViewContext viewContext) {
+    public boolean focusReceived(final ViewPanel viewPanel) {
         showBorder();
+        return true;
     }
 
     public WireframeBox getBorders() {
@@ -91,18 +93,20 @@ public class GuiComponent extends AbstractCompositeShape implements
     }
 
     @Override
-    public void keyPressed(final KeyEvent event, final ViewContext viewContext) {
+    public boolean keyPressed(final KeyEvent event, final ViewPanel viewPanel) {
         if (event.getKeyChar() == KeyboardHelper.ESC)
-            viewContext.getKeyboardFocusTracker().popFocusOwner();
+            viewPanel.getKeyboardFocusStack().popFocusOwner();
+        return true;
     }
 
     @Override
-    public void keyReleased(final KeyEvent event, final ViewContext viewContext) {
+    public boolean keyReleased(final KeyEvent event, final ViewPanel viewPanel) {
+        return false;
     }
 
     @Override
     public void mouseClicked() {
-        viewContext.getKeyboardFocusTracker().setFocusOwner(this);
+        viewPanel.getKeyboardFocusStack().pushFocusOwner(this);
     }
 
     @Override
@@ -117,7 +121,7 @@ public class GuiComponent extends AbstractCompositeShape implements
         containingBox.setSizeCentered(size);
     }
 
-    public void showBorder() {
+    private void showBorder() {
         if (borderShown)
             return;
         borderShown = true;