Fix generics in most of the Gui interfaces

This commit is contained in:
johni0702
2015-07-11 17:49:06 +02:00
parent 4476993ca6
commit bd21ed16ae
8 changed files with 8 additions and 9 deletions

View File

@@ -22,7 +22,7 @@
package de.johni0702.minecraft.gui.element;
public interface IGuiButton<T extends AbstractGuiButton<T>> extends IGuiClickable<T> {
public interface IGuiButton<T extends IGuiButton<T>> extends IGuiClickable<T> {
T setLabel(String label);
T setI18nLabel(String label, Object... args);

View File

@@ -22,7 +22,7 @@
package de.johni0702.minecraft.gui.element;
public interface IGuiCheckbox<T extends AbstractGuiCheckbox<T>> extends IGuiClickable<T> {
public interface IGuiCheckbox<T extends IGuiCheckbox<T>> extends IGuiClickable<T> {
T setLabel(String label);
T setI18nLabel(String label, Object... args);

View File

@@ -22,6 +22,6 @@
package de.johni0702.minecraft.gui.element;
public interface IGuiClickable<T extends AbstractGuiClickable<T>> extends GuiElement<T> {
public interface IGuiClickable<T extends IGuiClickable<T>> extends GuiElement<T> {
T onClick(Runnable onClick);
}

View File

@@ -24,6 +24,6 @@ package de.johni0702.minecraft.gui.element;
import java.awt.image.BufferedImage;
public interface IGuiImage<T extends AbstractGuiImage<T>> extends GuiElement<T> {
public interface IGuiImage<T extends IGuiImage<T>> extends GuiElement<T> {
T setTexture(BufferedImage img);
}

View File

@@ -24,7 +24,7 @@ package de.johni0702.minecraft.gui.element;
import org.lwjgl.util.ReadableColor;
public interface IGuiLabel<T extends AbstractGuiLabel<T>> extends GuiElement<T> {
public interface IGuiLabel<T extends IGuiLabel<T>> extends GuiElement<T> {
T setText(String text);
T setI18nText(String text, Object... args);

View File

@@ -22,7 +22,7 @@
package de.johni0702.minecraft.gui.element;
public interface IGuiToggleButton<V, T extends AbstractGuiToggleButton<V, T>> extends IGuiButton<T> {
public interface IGuiToggleButton<V, T extends IGuiToggleButton<V, T>> extends IGuiButton<T> {
T setValues(V[] values);
T setSelected(int selected);

View File

@@ -33,7 +33,7 @@ import org.lwjgl.util.Dimension;
import org.lwjgl.util.ReadableColor;
import org.lwjgl.util.ReadableDimension;
public abstract class AbstractGuiProgressBar<T extends AbstractGuiElement<T>> extends AbstractGuiElement<T> implements IGuiProgressBar<T> {
public abstract class AbstractGuiProgressBar<T extends AbstractGuiProgressBar<T>> extends AbstractGuiElement<T> implements IGuiProgressBar<T> {
private static final int BORDER = 2;
@Getter

View File

@@ -22,10 +22,9 @@
package de.johni0702.minecraft.gui.element.advanced;
import de.johni0702.minecraft.gui.element.AbstractGuiElement;
import de.johni0702.minecraft.gui.element.GuiElement;
public interface IGuiProgressBar<T extends AbstractGuiElement<T>> extends GuiElement<T> {
public interface IGuiProgressBar<T extends IGuiProgressBar<T>> extends GuiElement<T> {
T setProgress(float progress);
T setLabel(String label);