Skip to content

Commit 896f62b

Browse files
authored
Fix sonar bad practice issues (#461)
1 parent 6e1fa57 commit 896f62b

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

tiles/src/main/java/com/protomaps/basemap/text/FontRegistry.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.Enumeration;
1111
import java.util.HashMap;
1212
import java.util.List;
13+
import java.util.Map;
1314
import java.util.zip.ZipEntry;
1415
import java.util.zip.ZipFile;
1516
import org.slf4j.Logger;
@@ -22,9 +23,9 @@ private class FontBundle {
2223
public String name;
2324
public String version;
2425
public Font font;
25-
public HashMap<String, Integer> encoding;
26+
public Map<String, Integer> encoding;
2627

27-
public FontBundle(String name, String version, Font font, HashMap<String, Integer> encoding) {
28+
public FontBundle(String name, String version, Font font, Map<String, Integer> encoding) {
2829
this.name = name;
2930
this.version = version;
3031
this.font = font;
@@ -192,7 +193,7 @@ public Font getFont(String script) {
192193
return fontBundle.font;
193194
}
194195

195-
public HashMap<String, Integer> getEncoding(String script) {
196+
public Map<String, Integer> getEncoding(String script) {
196197
FontBundle fontBundle = registry.get(script);
197198
if (fontBundle == null) {
198199
return new HashMap<>();

tiles/src/main/java/com/protomaps/basemap/text/TextEngine.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.awt.font.GlyphMetrics;
77
import java.awt.font.GlyphVector;
88
import java.util.ArrayList;
9-
import java.util.HashMap;
109
import java.util.List;
10+
import java.util.Map;
1111
import java.util.regex.Matcher;
1212
import java.util.regex.Pattern;
1313
import org.slf4j.Logger;
@@ -60,7 +60,7 @@ public class TextEngine {
6060
{4, 0},
6161
};
6262

63-
private static int codepointFromGlyph(HashMap<String, Integer> encoding, int index, int xOffset, int yOffset,
63+
private static int codepointFromGlyph(Map<String, Integer> encoding, int index, int xOffset, int yOffset,
6464
int xAdvance, int yAdvance) {
6565

6666
for (int i = 0; i < deltas.length; ++i) {
@@ -83,7 +83,7 @@ private static int codepointFromGlyph(HashMap<String, Integer> encoding, int ind
8383
return 33;
8484
}
8585

86-
public static String encode(String text, Font font, HashMap<String, Integer> encoding) {
86+
public static String encode(String text, Font font, Map<String, Integer> encoding) {
8787
String result = "";
8888

8989
FontRenderContext frc = new FontRenderContext(null, true, true);

tiles/src/test/java/com/protomaps/basemap/text/TextEngineTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import java.awt.Font;
66
import java.nio.file.Path;
7-
import java.util.HashMap;
87
import java.util.List;
8+
import java.util.Map;
99
import org.junit.jupiter.api.Test;
1010

1111
public class TextEngineTest {
@@ -25,7 +25,7 @@ void testEncode() {
2525

2626
String text = "काठमाडौँ";
2727
Font font = fontRegistry.getFont(script);
28-
HashMap<String, Integer> encoding = fontRegistry.getEncoding(script);
28+
Map<String, Integer> encoding = fontRegistry.getEncoding(script);
2929

3030
String textEncoded = TextEngine.encode(text, font, encoding);
3131

0 commit comments

Comments
 (0)