Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
woutersmeenk committed Sep 15, 2010
1 parent eeff74c commit d5c07e7
Show file tree
Hide file tree
Showing 9 changed files with 86 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/main/java/walledin/engine/gui/AbstractScreen.java
Expand Up @@ -566,7 +566,7 @@ public final void sendKeyDownMessage(final ScreenKeyEvent e) {
*
* @return True if it has the focus, else false.
*/
private final boolean hasFocus() {
private boolean hasFocus() {
return getManager().getFocusedScreen() == this;
}

Expand Down
20 changes: 20 additions & 0 deletions src/main/java/walledin/engine/gui/FontType.java
@@ -1,3 +1,23 @@
/* Copyright 2010 Ben Ruijl, Wouter Smeenk
This file is part of Walled In.
Walled In is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
Walled In is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with Walled In; see the file LICENSE. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
*/
package walledin.engine.gui;

public enum FontType {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/walledin/engine/gui/components/ListView.java
Expand Up @@ -67,7 +67,7 @@ public String[] getData() {
private final int numColumns;
private final Button[] columns;
private float[] columnWidth;
private float[] accumulatedColumnWidth;
private final float[] accumulatedColumnWidth;
private final List<RowData<T>> data;
private Comparator<RowData<T>> lastComparator;
private int selected;
Expand Down Expand Up @@ -194,7 +194,7 @@ public int compare(final RowData<T> o1, final RowData<T> o2) {
};
}

protected void onListItemClicked(T item) {
protected void onListItemClicked(final T item) {
}

@Override
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/walledin/engine/gui/components/Slider.java
@@ -1,3 +1,23 @@
/* Copyright 2010 Ben Ruijl, Wouter Smeenk
This file is part of Walled In.
Walled In is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
Walled In is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with Walled In; see the file LICENSE. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
*/
package walledin.engine.gui.components;

import java.util.ArrayList;
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/walledin/engine/input/MouseEvent.java
@@ -1,3 +1,23 @@
/* Copyright 2010 Ben Ruijl, Wouter Smeenk
This file is part of Walled In.
Walled In is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
Walled In is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with Walled In; see the file LICENSE. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
*/
package walledin.engine.input;

import walledin.engine.math.Vector2i;
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/walledin/engine/input/MouseEventListener.java
@@ -1,3 +1,23 @@
/* Copyright 2010 Ben Ruijl, Wouter Smeenk
This file is part of Walled In.
Walled In is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
Walled In is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with Walled In; see the file LICENSE. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
*/
package walledin.engine.input;

public interface MouseEventListener {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/walledin/game/PlayerActionManager.java
Expand Up @@ -32,7 +32,7 @@
import walledin.engine.input.Input;
import walledin.util.SettingsManager;

public final class PlayerActionManager {
public final class PlayerActionManager {
private static final Logger LOG = Logger
.getLogger(PlayerActionManager.class);
private static PlayerActionManager ref = null;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/walledin/game/gui/MainMenuScreen.java
Expand Up @@ -28,7 +28,6 @@
import walledin.engine.gui.ScreenMouseEvent;
import walledin.engine.gui.ScreenMouseEventListener;
import walledin.engine.gui.components.Button;
import walledin.engine.gui.components.ListView;
import walledin.engine.math.Rectangle;
import walledin.engine.math.Vector2f;
import walledin.game.ClientLogicManager;
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/walledin/game/gui/components/ServerList.java
Expand Up @@ -20,7 +20,6 @@
*/
package walledin.game.gui.components;

import java.util.ArrayList;
import java.util.List;

import walledin.engine.Font;
Expand Down Expand Up @@ -66,8 +65,8 @@ public void update(final double delta) {
/* Start with an empty list. */
resetData();

for (ServerData serverData : serverList) {
String[] stringData = { serverData.getName(),
for (final ServerData serverData : serverList) {
final String[] stringData = { serverData.getName(),
serverData.getPlayers() + "/" + serverData.getMaxPlayers(),
serverData.getGameMode().toString() };
addData(new RowData<ServerData>(serverData, stringData));
Expand Down

0 comments on commit d5c07e7

Please sign in to comment.