Skip to content

Commit fda1eca

Browse files
KonlochKonloch
committed
Code Style Update
1 parent c85a8a2 commit fda1eca

File tree

350 files changed

+26888
-27854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+26888
-27854
lines changed

‎src/main/java/me/konloch/kontainer/io/DiskReader.java

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
package me.konloch.kontainer.io;
22

3+
import the.bytecode.club.bytecodeviewer.util.EncodeUtils;
4+
35
import java.io.BufferedReader;
46
import java.io.File;
57
import java.io.FileReader;
6-
import java.util.ArrayList;
7-
import java.util.HashMap;
8-
import java.util.List;
9-
import java.util.Map;
10-
import java.util.Random;
11-
import the.bytecode.club.bytecodeviewer.util.EncodeUtils;
8+
import java.util.*;
129

1310
/**
1411
* Used to load from the disk, optional caching
1512
*
1613
* @author Konloch
1714
*/
1815

19-
public class DiskReader {
16+
public class DiskReader
17+
{
2018

2119
public static Random random = new Random();
2220
public static Map<String, List<String>> map = new HashMap<>();
2321

2422
/**
2523
* Used to load from file, allows caching
2624
*/
27-
public synchronized static List<String> loadArrayList(String fileName,
28-
boolean cache) {
25+
public synchronized static List<String> loadArrayList(String fileName, boolean cache)
26+
{
2927
List<String> array = new ArrayList<>();
30-
if (!map.containsKey(fileName)) {
31-
try {
28+
if (!map.containsKey(fileName))
29+
{
30+
try
31+
{
3232
File file = new File(fileName);
3333
if (!file.exists()) // doesn't exist, return empty
3434
return array;
3535

36-
try (FileReader fr = new FileReader(file);
37-
BufferedReader reader = new BufferedReader(fr)) {
36+
try (FileReader fr = new FileReader(file); BufferedReader reader = new BufferedReader(fr))
37+
{
3838
String add;
3939

4040
while ((add = reader.readLine()) != null)
@@ -44,10 +44,14 @@ public synchronized static List<String> loadArrayList(String fileName,
4444

4545
if (cache)
4646
map.put(fileName, array);
47-
} catch (Exception e) {
47+
}
48+
catch (Exception e)
49+
{
4850
e.printStackTrace();
4951
}
50-
} else {
52+
}
53+
else
54+
{
5155
array = map.get(fileName);
5256
}
5357

@@ -58,12 +62,14 @@ public synchronized static List<String> loadArrayList(String fileName,
5862
/**
5963
* Used to load from file
6064
*/
61-
public synchronized static String loadAsString(String fileName) throws Exception {
65+
public synchronized static String loadAsString(String fileName) throws Exception
66+
{
6267
StringBuilder s = new StringBuilder();
6368

64-
try (FileReader fr = new FileReader(fileName);
65-
BufferedReader reader = new BufferedReader(fr)) {
66-
for (String add = reader.readLine(); add != null; add = reader.readLine()) {
69+
try (FileReader fr = new FileReader(fileName); BufferedReader reader = new BufferedReader(fr))
70+
{
71+
for (String add = reader.readLine(); add != null; add = reader.readLine())
72+
{
6773
s.append(EncodeUtils.unicodeToString(add)).append(System.lineSeparator());
6874
}
6975
}
@@ -74,16 +80,17 @@ public synchronized static String loadAsString(String fileName) throws Exception
7480
/**
7581
* Used to load a string via line number lineNumber = -1 means random.
7682
*/
77-
public static String loadString(String fileName, int lineNumber,
78-
boolean cache) throws Exception {
83+
public static String loadString(String fileName, int lineNumber, boolean cache) throws Exception
84+
{
7985

8086
List<String> array;
81-
if (!map.containsKey(fileName)) {
87+
if (!map.containsKey(fileName))
88+
{
8289
array = new ArrayList<>();
8390
File file = new File(fileName);
8491

85-
try (FileReader fr = new FileReader(file);
86-
BufferedReader reader = new BufferedReader(fr)) {
92+
try (FileReader fr = new FileReader(file); BufferedReader reader = new BufferedReader(fr))
93+
{
8794
String add;
8895

8996
while ((add = reader.readLine()) != null)
@@ -92,14 +99,18 @@ public static String loadString(String fileName, int lineNumber,
9299

93100
if (cache)
94101
map.put(fileName, array);
95-
} else {
102+
}
103+
else
104+
{
96105
array = map.get(fileName);
97106
}
98107

99-
if (lineNumber == -1) {
108+
if (lineNumber == -1)
109+
{
100110
int size = array.size();
101111
return array.get(random.nextInt(size));
102-
} else
112+
}
113+
else
103114
return array.get(lineNumber);
104115
}
105116

‎src/main/java/me/konloch/kontainer/io/DiskWriter.java

Lines changed: 58 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package me.konloch.kontainer.io;
22

3-
import java.io.BufferedWriter;
4-
import java.io.File;
5-
import java.io.FileOutputStream;
6-
import java.io.FileWriter;
7-
import java.io.PrintWriter;
3+
import java.io.*;
84
import java.util.Arrays;
95

106
/**
@@ -13,23 +9,26 @@
139
* @author Konloch
1410
*/
1511

16-
public class DiskWriter {
12+
public class DiskWriter
13+
{
1714

1815
/**
1916
* Used to insert a difference string with preserving the file extension
2017
*
2118
* @param fileName The file name
2219
* @param difference Normally an integer
2320
* @return The filename with the difference inserted and the file extension
24-
* preserved
21+
* preserved
2522
*/
26-
public static String insertFileName(String fileName, String difference) {
23+
public static String insertFileName(String fileName, String difference)
24+
{
2725
String[] babe = fileName.split("\\.");
2826
int count = 0;
2927
int math = babe.length;
3028
StringBuilder m = new StringBuilder();
3129

32-
for (String s2 : babe) {
30+
for (String s2 : babe)
31+
{
3332
m.append(s2);
3433
if (math - 2 == count)
3534
m.append(difference).append(".");
@@ -49,8 +48,8 @@ else if (math - 1 != count)
4948
* @param fileContents
5049
* @param debug
5150
*/
52-
public static synchronized void writeNewLine(String filename,
53-
byte[] fileContents, boolean debug) {
51+
public static synchronized void writeNewLine(String filename, byte[] fileContents, boolean debug)
52+
{
5453
new File(filename).getParentFile().mkdirs();
5554
String original = filename;
5655
int counter = 0;
@@ -59,26 +58,28 @@ public static synchronized void writeNewLine(String filename,
5958
int failSafe = 0;
6059
while (!saved && failSafe++ <= 42069)
6160
{
62-
try (FileWriter fr = new FileWriter(filename, true);
63-
BufferedWriter bw = new BufferedWriter(fr);
64-
PrintWriter writer = new PrintWriter(bw)) {
61+
try (FileWriter fr = new FileWriter(filename, true); BufferedWriter bw = new BufferedWriter(fr); PrintWriter writer = new PrintWriter(bw))
62+
{
6563
writer.println(Arrays.toString(fileContents));
6664
if (debug)
6765
System.out.println("Saved " + filename + " to disk");
6866
saved = true;
69-
} catch (Exception e) {
67+
}
68+
catch (Exception e)
69+
{
7070
if (debug)
71-
System.out.println("Failed saving, trying to save as "
72-
+ filename);
73-
if (original.contains(".")) {
71+
System.out.println("Failed saving, trying to save as " + filename);
72+
if (original.contains("."))
73+
{
7474
filename = insertFileName(original, "" + counter);
75-
} else
75+
}
76+
else
7677
filename = original + counter;
7778
counter++;
7879
}
7980
}
8081
}
81-
82+
8283
/**
8384
* Writes a string to the file
8485
*/
@@ -90,8 +91,8 @@ public static void writeNewLine(String filename, String lineToWrite)
9091
/**
9192
* Writes a string to the file
9293
*/
93-
public static synchronized void writeNewLine(String filename,
94-
String lineToWrite, boolean debug) {
94+
public static synchronized void writeNewLine(String filename, String lineToWrite, boolean debug)
95+
{
9596
new File(filename).getParentFile().mkdirs();
9697
String original = filename;
9798
int counter = 0;
@@ -100,21 +101,22 @@ public static synchronized void writeNewLine(String filename,
100101
int failSafe = 0;
101102
while (!saved && failSafe++ <= 42069)
102103
{
103-
try (FileWriter fr = new FileWriter(filename, true);
104-
BufferedWriter bw = new BufferedWriter(fr);
105-
PrintWriter writer = new PrintWriter(bw)) {
104+
try (FileWriter fr = new FileWriter(filename, true); BufferedWriter bw = new BufferedWriter(fr); PrintWriter writer = new PrintWriter(bw))
105+
{
106106
writer.println(lineToWrite);
107107
if (debug)
108-
System.out.println("Saved " + filename + ">" + lineToWrite
109-
+ " to disk");
108+
System.out.println("Saved " + filename + ">" + lineToWrite + " to disk");
110109
saved = true;
111-
} catch (Exception e) {
110+
}
111+
catch (Exception e)
112+
{
112113
if (debug)
113-
System.out.println("Failed saving, trying to save as "
114-
+ filename);
115-
if (original.contains(".")) {
114+
System.out.println("Failed saving, trying to save as " + filename);
115+
if (original.contains("."))
116+
{
116117
filename = insertFileName(original, "" + counter);
117-
} else
118+
}
119+
else
118120
filename = original + counter;
119121
counter++;
120122
}
@@ -129,13 +131,13 @@ public static synchronized void writeNewLine(String filename,
129131
* @param fileContents
130132
* @param debug
131133
*/
132-
public static synchronized void replaceFileBytes(String filename,
133-
byte[] fileContents, boolean debug) {
134+
public static synchronized void replaceFileBytes(String filename, byte[] fileContents, boolean debug)
135+
{
134136
new File(filename).getParentFile().mkdirs();
135137
File f = new File(filename);
136138
if (f.exists())
137139
f.delete();
138-
140+
139141
String original = filename;
140142
int counter = 0;
141143

@@ -150,13 +152,16 @@ public static synchronized void replaceFileBytes(String filename,
150152
if (debug)
151153
System.out.println("Saved " + filename + " to disk");
152154
saved = true;
153-
} catch (Exception e) {
155+
}
156+
catch (Exception e)
157+
{
154158
if (debug)
155-
System.out.println("Failed saving, trying to save as "
156-
+ filename);
157-
if (original.contains(".")) {
159+
System.out.println("Failed saving, trying to save as " + filename);
160+
if (original.contains("."))
161+
{
158162
filename = insertFileName(original, "" + counter);
159-
} else
163+
}
164+
else
160165
filename = original + counter;
161166
counter++;
162167
}
@@ -171,8 +176,8 @@ public static synchronized void replaceFileBytes(String filename,
171176
* @param lineToWrite
172177
* @param debug
173178
*/
174-
public static synchronized void replaceFile(String filename,
175-
String lineToWrite, boolean debug) {
179+
public static synchronized void replaceFile(String filename, String lineToWrite, boolean debug)
180+
{
176181
new File(filename).getParentFile().mkdirs();
177182
File f = new File(filename);
178183
if (f.exists())
@@ -184,21 +189,22 @@ public static synchronized void replaceFile(String filename,
184189
int failSafe = 0;
185190
while (!saved && failSafe++ <= 42069)
186191
{
187-
try (FileWriter fr = new FileWriter(filename, true);
188-
BufferedWriter bw = new BufferedWriter(fr);
189-
PrintWriter writer = new PrintWriter(bw)) {
192+
try (FileWriter fr = new FileWriter(filename, true); BufferedWriter bw = new BufferedWriter(fr); PrintWriter writer = new PrintWriter(bw))
193+
{
190194
writer.println(lineToWrite);
191195
if (debug)
192-
System.out.println("Saved " + filename + ">" + lineToWrite
193-
+ " to disk");
196+
System.out.println("Saved " + filename + ">" + lineToWrite + " to disk");
194197
saved = true;
195-
} catch (Exception e) {
198+
}
199+
catch (Exception e)
200+
{
196201
if (debug)
197-
System.out.println("Failed saving, trying to save as "
198-
+ filename + "_");
199-
if (original.contains(".")) {
202+
System.out.println("Failed saving, trying to save as " + filename + "_");
203+
if (original.contains("."))
204+
{
200205
filename = insertFileName(original, "" + counter);
201-
} else
206+
}
207+
else
202208
filename = original + counter;
203209
counter++;
204210
}

0 commit comments

Comments
 (0)