Skip to content

Commit c45131d

Browse files
committed
Fix string format issues in logs
Remove some unused imports
1 parent bb5daa3 commit c45131d

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ dist/
88
*.dsg
99
build.xml
1010
nbproject/
11+
.gradle
12+
gradle/
13+
gradlew
14+
gradlew.bat
1115

1216
# Intellij
1317
*.iml

src/g/Signals.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
//
2020
import doom.event_t;
2121
import doom.evtype_t;
22-
import static java.awt.event.InputEvent.ALT_DOWN_MASK;
23-
import static java.awt.event.InputEvent.CTRL_DOWN_MASK;
24-
import static java.awt.event.InputEvent.META_DOWN_MASK;
25-
import static java.awt.event.InputEvent.SHIFT_DOWN_MASK;
2622
import java.awt.event.KeyEvent;
2723
import static java.awt.event.KeyEvent.*;
2824

src/p/BoomLevelLoader.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ private void P_LoadSegs(int lump) {
542542
li.frontsector = sides[ldef.sidenum[side]].sector;
543543
} else {
544544
li.frontsector = null;
545-
LOGGER.log(Level.INFO, String.format("P_LoadSegs: front of seg %i has no sidedef", i));
545+
LOGGER.log(Level.INFO, String.format("P_LoadSegs: front of seg %d has no sidedef", i));
546546
}
547547

548548
if (flags(ldef.flags, ML_TWOSIDED) && ldef.sidenum[side ^ 1] != NO_INDEX) {
@@ -666,7 +666,7 @@ linedef, i, unsigned(ldef.sidenum[side])
666666
li.frontsector = sides[ldef.sidenum[side]].sector;
667667
} else {
668668
li.frontsector = null;
669-
LOGGER.log(Level.WARNING, String.format("P_LoadSegs_V4: front of seg %i has no sidedef", i));
669+
LOGGER.log(Level.WARNING, String.format("P_LoadSegs_V4: front of seg %d has no sidedef", i));
670670
}
671671

672672
if (flags(ldef.flags, ML_TWOSIDED)
@@ -995,7 +995,7 @@ i, unsigned(linedef)
995995

996996
// e6y: fix wrong side index
997997
if (side != 0 && side != 1) {
998-
LOGGER.log(Level.WARNING, String.format("P_LoadZSegs: seg %d contains wrong side index %d. Replaced with 1.", i, side));
998+
LOGGER.log(Level.WARNING, String.format("P_LoadZSegs: seg %d contains wrong side index %d. Replaced with 1.", i, (int) side));
999999
side = 1;
10001000
}
10011001

@@ -1018,7 +1018,7 @@ linedef, i, unsigned(ldef.sidenum[side])
10181018
li.frontsector = sides[ldef.sidenum[side]].sector;
10191019
} else {
10201020
li.frontsector = null;
1021-
LOGGER.log(Level.WARNING, String.format("P_LoadZSegs: front of seg %i has no sidedef", i));
1021+
LOGGER.log(Level.WARNING, String.format("P_LoadZSegs: front of seg %d has no sidedef", i));
10221022
}
10231023

10241024
if (flags(ldef.flags, ML_TWOSIDED) && (ldef.sidenum[side ^ 1] != NO_INDEX)) {
@@ -1490,7 +1490,7 @@ private void P_LoadSideDefs2(int lump) {
14901490
*/
14911491
char sector_num = (char) msd.sector;
14921492
if (sector_num >= numsectors) {
1493-
LOGGER.log(Level.WARNING, String.format("P_LoadSideDefs2: sidedef %i has out-of-range sector num %u\n", i, sector_num));
1493+
LOGGER.log(Level.WARNING, String.format("P_LoadSideDefs2: sidedef %d has out-of-range sector num %d", i, (int) sector_num));
14941494
sector_num = 0;
14951495
}
14961496
sd.sector = sec = sectors[sector_num];

src/rr/SimpleTextureManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ public column_t GetSmpColumn(int tex, int col, int id) {
12411241
// but it doesn't yet exist. Create it.
12421242
if (getMaskedComposite(tex) == null) {
12431243
LOGGER.log(Level.WARNING, String.format("Forced generation of composite %s",
1244-
CheckTextureNameForNum(tex), smp_composite[id], col, ofs));
1244+
CheckTextureNameForNum(tex)));
12451245
GenerateMaskedComposite(tex);
12461246
LOGGER.log(Level.WARNING, String.format("Composite patch %s %d",
12471247
getMaskedComposite(tex).name, getMaskedComposite(tex).columns.length));
@@ -1312,7 +1312,7 @@ public byte[] GetColumn(int tex, int col) {
13121312
// but it doesn't yet exist. Create it.
13131313
if (getMaskedComposite(tex) == null) {
13141314
LOGGER.log(Level.WARNING,
1315-
String.format("Forced generation of composite %s", CheckTextureNameForNum(tex), composite, col, ofs));
1315+
String.format("Forced generation of composite %s", CheckTextureNameForNum(tex)));
13161316
GenerateMaskedComposite(tex);
13171317
LOGGER.log(Level.WARNING,
13181318
String.format("Composite patch %s %d", getMaskedComposite(tex).name, getMaskedComposite(tex).columns.length));
@@ -1378,7 +1378,7 @@ public column_t GetColumnStruct(int tex, int col) {
13781378
// but it doesn't yet exist. Create it.
13791379
if (getMaskedComposite(tex) == null) {
13801380
LOGGER.log(Level.WARNING,
1381-
String.format("Forced generation of composite %s", CheckTextureNameForNum(tex), composite, col, ofs));
1381+
String.format("Forced generation of composite %s", CheckTextureNameForNum(tex)));
13821382
GenerateMaskedComposite(tex);
13831383
LOGGER.log(Level.WARNING,
13841384
String.format("Composite patch %s %d", getMaskedComposite(tex).name, getMaskedComposite(tex).columns.length));

src/rr/parallel/MaskedWorker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ protected final void DrawVisSprite(vissprite_t<V> vis) {
207207
column = patch.columns[texturecolumn];
208208

209209
if (column == null) {
210-
LOGGER.log(Level.WARNING, String.format("Null column for texturecolumn %d", texturecolumn, x1, x2));
210+
LOGGER.log(Level.WARNING, String.format("Null column for texturecolumn %d", texturecolumn));
211211
} else {
212212
DrawMaskedColumn(column);
213213
}

src/s/QMusToMid.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ int qmus2mid(InputStream mus, Object mid, boolean nodisplay,
490490
if (division != 89) {
491491
LOGGER.log(Level.FINE, "MID file");
492492
} else {
493-
LOGGER.log(Level.FINE, String.format("Playing time: %dmin %dsec", min, sec));
493+
LOGGER.log(Level.FINE, String.format("Playing time: %dmin %dsec", (int) min, (int) sec));
494494
}
495495
}
496496
if (!nodisplay) {

0 commit comments

Comments
 (0)