Remove Focusable and FocusManager and implemented focus request in Co…

…ntext and ClickGUI instead, added parameter to setPosition, made Context final

src/main/java/com/lukflug/panelstudio/ClickGUI.java

@@ -8,7 +8,7 @@
  * All components should be a direct or indirect child of this objects.
  * @author lukflug
  */
-public class ClickGUI implements FocusManager {
+public class ClickGUI {
 	/**
 	 * List of direct child components (i.e. panels).
 	 * The must all be {@link FixedComponent}.
@@ -55,9 +55,10 @@ public void addComponent (FixedComponent component) {
 	 */
 	public void render() {
 		int highest=0;
+		FixedComponent focusComponent=null;
 		for (int i=components.size()-1;i>=0;i--) {
 			FixedComponent component=components.get(i);
-			Context context=new Context(inter,this,width,component.getPosition(inter),true,true);
+			Context context=new Context(inter,width,component.getPosition(inter),true,true);
 			component.getHeight(context);
 			if (context.isHovered()) {
 				highest=i;
@@ -66,8 +67,13 @@ public void render() {
 		}
 		for (int i=0;i<components.size();i++) {
 			FixedComponent component=components.get(i);
-			Context context=new Context(inter,this,width,component.getPosition(inter),true,i>=highest);
+			Context context=new Context(inter,width,component.getPosition(inter),true,i>=highest);
 			component.render(context);
+			if (context.foucsRequested()) focusComponent=component;
+		}
+		if (focusComponent!=null) {
+			components.remove(focusComponent);
+			components.add(focusComponent);
 		}
 	}
 
@@ -79,11 +85,17 @@ public void render() {
 	 */
 	public void handleButton (int button) {
 		boolean highest=true;
+		FixedComponent focusComponent=null;
 		for (int i=components.size()-1;i>=0;i--) {
 			FixedComponent component=components.get(i);
-			Context context=new Context(inter,this,width,component.getPosition(inter),true,highest);
+			Context context=new Context(inter,width,component.getPosition(inter),true,highest);
 			component.handleButton(context,button);
 			if (context.isHovered()) highest=false;
+			if (context.foucsRequested()) focusComponent=component;
+		}
+		if (focusComponent!=null) {
+			components.remove(focusComponent);
+			components.add(focusComponent);
 		}
 	}
 
@@ -93,10 +105,16 @@ public void handleButton (int button) {
 	 */
 	public void handleKey (int scancode) {
 		boolean highest=true;
+		FixedComponent focusComponent=null;
 		for (FixedComponent component: components) {
-			Context context=new Context(inter,this,width,component.getPosition(inter),true,highest);
+			Context context=new Context(inter,width,component.getPosition(inter),true,highest);
 			component.handleKey(context,scancode);
 			if (context.isHovered()) highest=false;
+			if (context.foucsRequested()) focusComponent=component;
+		}
+		if (focusComponent!=null) {
+			components.remove(focusComponent);
+			components.add(focusComponent);
 		}
 	}
 
@@ -105,20 +123,16 @@ public void handleKey (int scancode) {
 	 */
 	public void exit() {
 		boolean highest=true;
+		FixedComponent focusComponent=null;
 		for (FixedComponent component: components) {
-			Context context=new Context(inter,this,width,component.getPosition(inter),true,highest);
+			Context context=new Context(inter,width,component.getPosition(inter),true,highest);
 			component.exit(context);
 			if (context.isHovered()) highest=false;
+			if (context.foucsRequested()) focusComponent=component;
+		}
+		if (focusComponent!=null) {
+			components.remove(focusComponent);
+			components.add(focusComponent);
 		}
-	}
-
-	/**
-	 * Method to be called by a panel that requests focus within the GUI.
-	 * Moves the panel requesting focus to the top.
-	 */
-	@Override
-	public void requestFocus (Focusable component) {
-		components.remove(component);
-		components.add((FixedComponent)component);
 	}
 }

src/main/java/com/lukflug/panelstudio/Context.java

@@ -8,7 +8,7 @@
  * A class for the communication between a component and its parent.
  * @author lukflug
  */
-public class Context {
+public final class Context {
 	/**
 	 * The current {@link Interface}.
 	 */

src/main/java/com/lukflug/panelstudio/DraggableContainer.java

@@ -71,7 +71,7 @@ public Point getPosition (Interface inter) {
 	 * Set the position of the panel.
 	 */
 	@Override
-	public void setPosition(final Point position) {
+	public void setPosition(Interface inter, Point position) {
 		this.position=new Point(position);
 	}
 
@@ -80,6 +80,6 @@ public void setPosition(final Point position) {
 	 */
 	@Override
 	protected void handleFocus (Context context, boolean focus) {
-		if (focus) context.getFocusManager().requestFocus(this);
+		if (focus) context.requestFocus();
 	}
 }

src/main/java/com/lukflug/panelstudio/FixedComponent.java

@@ -7,7 +7,7 @@
  * (i.e. the position isn't determined by the parent via {@link Context}).
  * @author lukflug
  */
-public interface FixedComponent extends Component,Focusable {
+public interface FixedComponent extends Component {
 	/**
 	 * Get the current component position.
 	 * @param inter current interface
@@ -17,7 +17,8 @@ public interface FixedComponent extends Component,Focusable {
 
 	/**
 	 * Set the current component position.
+	 * @param inter current interface
 	 * @param position new position
 	 */
-	public void setPosition (Point position);
+	public void setPosition (Interface inter, Point position);
 }