Skip to content

Commit

Permalink
Clean up mixed indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
AntumDeluge committed Oct 23, 2023
1 parent 52f25eb commit 38b0d06
Show file tree
Hide file tree
Showing 110 changed files with 2,011 additions and 2,007 deletions.
14 changes: 7 additions & 7 deletions src/games/stendhal/client/LogUncaughtExceptionHandler.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Marauroa *
* (C) Copyright 2003-2023 - Marauroa *
***************************************************************************
***************************************************************************
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
package games.stendhal.client;

Expand Down
2 changes: 1 addition & 1 deletion src/games/stendhal/client/OutfitStore.java
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private Sprite buildOutfit(final String strcode, final OutfitColor color) {
final List<String> lnames = new LinkedList<>();
lnames.addAll(LAYER_NAMES);

// initialize outfit parts to 0 in case some haven't been specified
// initialize outfit parts to 0 in case some haven't been specified
for (String n: lnames) {
layer_map.put(n, 0);
}
Expand Down
4 changes: 2 additions & 2 deletions src/games/stendhal/client/actions/GMHelpAction.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -40,7 +40,7 @@ class GMHelpAction implements SlashAction {
*/
@Override
public boolean execute(final String[] params, final String remainder) {
List<String> lines;
List<String> lines;
if (params[0] == null) {
lines = Arrays.asList(
"For a detailed reference, visit #https://stendhalgame.org/wiki/Stendhal:Administration",
Expand Down
16 changes: 8 additions & 8 deletions src/games/stendhal/client/actions/ScreenshotAction.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************
* (C) Copyright 2003-2011 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -73,13 +73,13 @@ public void done() {
Logger.getLogger(ScreenshotAction.class).error(e);
} catch (ExecutionException e) {
msg = "Failed to save screenshot to " + fileName + " : ";
Throwable cause = e.getCause();
Logger.getLogger(ScreenshotAction.class).error(e);
if (cause != null) {
msg = cause.getMessage();
} else {
msg = e.getMessage();
}
Throwable cause = e.getCause();
Logger.getLogger(ScreenshotAction.class).error(e);
if (cause != null) {
msg = cause.getMessage();
} else {
msg = e.getMessage();
}
}
ClientSingletonRepository.getUserInterface().addEventLine(new EventLine("", msg, NotificationType.CLIENT));
}
Expand Down
34 changes: 17 additions & 17 deletions src/games/stendhal/client/entity/AudibleEntity.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -70,23 +70,23 @@ private String getRandomSoundFromCategory(String groupName) {
}

private String getSoundFromCategory(String groupName) {
ArrayList<String> soundNameList = mCategorys.get(groupName);
ArrayList<String> soundNameList = mCategorys.get(groupName);

if ((soundNameList != null) && !soundNameList.isEmpty()) {
return soundNameList.get(0);
}
if ((soundNameList != null) && !soundNameList.isEmpty()) {
return soundNameList.get(0);
}

return null;
return null;
}

private String getSoundFromCategory(String groupName, int index) {
ArrayList<String> soundNameList = mCategorys.get(groupName);
ArrayList<String> soundNameList = mCategorys.get(groupName);

if ((soundNameList != null) && !soundNameList.isEmpty()) {
return soundNameList.get(index);
}
if ((soundNameList != null) && !soundNameList.isEmpty()) {
return soundNameList.get(index);
}

return null;
return null;
}

@Override
Expand All @@ -109,12 +109,12 @@ protected void playRandomSoundFromGroup(String groupName, String categoryName, l
}

protected void playSoundFromCategory(String groupName, String categoryName) {
SoundGroup group = ClientSingletonRepository.getSound().getGroup(groupName);
group.play(getSoundFromCategory(categoryName), 0, mAudibleArea, new Time(), false, true);
SoundGroup group = ClientSingletonRepository.getSound().getGroup(groupName);
group.play(getSoundFromCategory(categoryName), 0, mAudibleArea, new Time(), false, true);
}

protected void playSoundFromCategory(String groupName, String categoryName, int index) {
SoundGroup group = ClientSingletonRepository.getSound().getGroup(groupName);
group.play(getSoundFromCategory(categoryName, index), 0, mAudibleArea, new Time(), false, true);
}
protected void playSoundFromCategory(String groupName, String categoryName, int index) {
SoundGroup group = ClientSingletonRepository.getSound().getGroup(groupName);
group.play(getSoundFromCategory(categoryName, index), 0, mAudibleArea, new Time(), false, true);
}
}
16 changes: 8 additions & 8 deletions src/games/stendhal/client/entity/NPC.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003 - Marauroa *
* (C) Copyright 2003-2023 - Marauroa *
***************************************************************************
***************************************************************************
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
package games.stendhal.client.entity;

Expand Down Expand Up @@ -56,7 +56,7 @@ public boolean isAttending() {
* Initialize this entity for an object.
*
* @param object
* The object.
* The object.
*
* @see #release()
*/
Expand Down
8 changes: 4 additions & 4 deletions src/games/stendhal/client/entity/Player.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003 - Marauroa *
* (C) Copyright 2003-2023 - Marauroa *
***************************************************************************
***************************************************************************
* *
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
* (at your option) any later version. *
* *
***************************************************************************/
package games.stendhal.client.entity;

Expand Down
4 changes: 2 additions & 2 deletions src/games/stendhal/client/gui/ProgressBar.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -123,7 +123,7 @@ public void cancel() {
timer.stop();
// workaround near failures in AWT at openjdk (tested on openjdk-1.6.0.0)
try {
this.dispose();
this.dispose();
} catch(NullPointerException npe) {
return;
}
Expand Down
20 changes: 10 additions & 10 deletions src/games/stendhal/client/gui/j2d/TextBoxFactory.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -191,15 +191,15 @@ private List<AttributedCharacterIterator> createFormattedLines(String text,
return splitFormatted(formattedString, width);
}

/**
* Draw a chat bubble.
*
* @param g2d
* @param fillColor the bacground color of the bubble
* @param outLineColor the color of the bubble outline
* @param width width of the bubble body
* @param height height of the bubble
*/
/**
* Draw a chat bubble.
*
* @param g2d
* @param fillColor the bacground color of the bubble
* @param outLineColor the color of the bubble outline
* @param width width of the bubble body
* @param height height of the bubble
*/
private void drawBubble(final Graphics2D g2d, final Color fillColor,
final Color outLineColor, final int width, final int height) {
/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ protected void drawTitle(final Graphics2D g2d, final int x, final int y, final i
* The drawn entity height.
*/
private void drawCombat(final Graphics2D g2d, final int x,
final int y, final int width, final int height) {
final int y, final int width, final int height) {
Rectangle2D wrect = entity.getArea();
final Rectangle srect = new Rectangle(
(int) (wrect.getX() * IGameScreen.SIZE_UNIT_PIXELS),
Expand Down
4 changes: 2 additions & 2 deletions src/games/stendhal/client/gui/map/MapPanel.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -256,7 +256,7 @@ private void updateView() {
* @param cd
* The collision map.
* @param pd
* The protection map.
* The protection map.
*/
void update(final CollisionDetection cd, final CollisionDetection pd) {
// calculate the size and scale of the map
Expand Down
4 changes: 2 additions & 2 deletions src/games/stendhal/client/gui/map/MapPanelController.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -186,7 +186,7 @@ public void refresh() {
* @param cd
* The collision map.
* @param pd
* The protection map.
* The protection map.
* @param zone
* The zone name.
* @param dangerLevel zone danger level
Expand Down
4 changes: 2 additions & 2 deletions src/games/stendhal/client/gui/stats/StatsPanel.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -241,7 +241,7 @@ void setChoking(final boolean choking) {
* Show indicator
*/
void setStatus(final StatusID ID, final boolean visible) {
statusIcons.setStatus(ID, visible);
statusIcons.setStatus(ID, visible);
}

/**
Expand Down
20 changes: 10 additions & 10 deletions src/games/stendhal/client/gui/stats/StatsPanelController.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* $Id$ */
/***************************************************************************
* (C) Copyright 2003-2010 - Stendhal *
* (C) Copyright 2003-2023 - Stendhal *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -574,15 +574,15 @@ public void run() {
}

Object value = event.getNewValue();
final StatusID ID = StatusID.getStatusID(event.getPropertyName());
final boolean enabled = value != null;
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
panel.setStatus(ID, enabled);
}
});
}
final StatusID ID = StatusID.getStatusID(event.getPropertyName());
final boolean enabled = value != null;
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
panel.setStatus(ID, enabled);
}
});
}
}

/**
Expand Down
14 changes: 7 additions & 7 deletions src/games/stendhal/client/gui/styled/StyledTableUI.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/***************************************************************************
* (C) Copyright 2013 - Faiumoni e.V *
* (C) Copyright 2013-2023 - Faiumoni e.V *
***************************************************************************
***************************************************************************
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
* *
* This program 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 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
package games.stendhal.client.gui.styled;

Expand Down
Loading

0 comments on commit 38b0d06

Please sign in to comment.