Skip to content

Commit

Permalink
git add --all
Browse files Browse the repository at this point in the history
  • Loading branch information
@Petersburg2020
Petersburg2020 committed Dec 26, 2022
1 parent 32f8bc3 commit f5f214b
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 84 deletions.
9 changes: 5 additions & 4 deletions src/main/java/nx/peter/java/util/Util.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,11 @@ public static int lastLetterBefore(String source, int index) {
}

public static int indexOf(String source, String text, int index, Position position) {
return switch (position) {
case After -> source.substring(0, index).lastIndexOf(text);
case Before -> source.substring(index + 1).indexOf(text);
};
switch (position) {
case After: return source.substring(0, index).lastIndexOf(text);
case Before: return source.substring(index + 1).indexOf(text);
default: return -1;
}
}

public static final String NUMBERS = "0123456789";
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/nx/peter/java/util/advanced/Advanced.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,17 +216,17 @@ public static ObjectDetail.Type getType(Object obj) {
}

public static String getType(ObjectDetail.Type type) {
return switch (type) {
case Boolean -> "BOOLEAN";
case Double -> "DECIMAL(11, 4)";
case Enum -> "ENUM";
case Float -> "FLOAT(8)";
case Integer -> "INTEGER";
case List, None, Map -> "";
case Long -> "BIGINT";
case Object -> "OBJECT";
case String -> "VARCHAR(200)";
};
switch (type) {
case Boolean: return "BOOLEAN";
case Double: return "DECIMAL(11, 4)";
case Enum: return "ENUM";
case Float: return "FLOAT(8)";
case Integer: return "INTEGER";
case Long: return "BIGINT";
case Object: return "OBJECT";
case String: return "VARCHAR(200)";
case List: case None: case Map: default: return "";
}
}

public static int toInt(Object obj, int def) {
Expand Down
41 changes: 21 additions & 20 deletions src/main/java/nx/peter/java/util/data/DataManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ public static List<Index> extractIndexes(CharSequence letters) {
StringBuilder index = new StringBuilder();
for (IntString property : getProperties(letters)) {
if (isIndex(property.letter) || (property.letter.contentEquals("°") && !index.toString().contains("°"))) {
if (property.letter.contentEquals("°") && index.isEmpty())
if (property.letter.contentEquals("°") && index.toString().isEmpty())
index.append("⁰");
index.append(property.letter);
} else {
Expand Down Expand Up @@ -746,10 +746,11 @@ public static List<Object> extractArray(CharSequence letters) {
String type = getType(value);
if (type.contentEquals(NULL)) break;

Object val = switch (type) {
case OBJECT -> extractObject(value);
case ARRAY -> extractArray(value);
default -> toObject(value);
Object val;
switch (type) {
case OBJECT: val = extractObject(value); break;
case ARRAY: val = extractArray(value); break;
default: val = toObject(value);
};

array.add(val);
Expand Down Expand Up @@ -807,11 +808,12 @@ else if (value.startsWith("{") && !value.endsWith("}"))
String type = getType(value);
if (type.contentEquals(NULL)) break;

Object val = switch (type) {
case OBJECT -> extractObject(value);
case ARRAY -> extractArray(value);
default -> toObject(value);
};
Object val;
switch (type) {
case OBJECT: val = extractObject(value); break;
case ARRAY: val = extractArray(value); break;
default: val = toObject(value);
}
object.put(key, val);

if (type.contentEquals(OBJECT) || type.contentEquals(ARRAY) || type.contentEquals(STRING))
Expand Down Expand Up @@ -893,16 +895,15 @@ public static boolean isValid(Word source, char open, char close, int start) {


public static Object toObject(String value) {
return switch (getType(value)) {
case BOOLEAN -> value.contentEquals("true");
case INTEGER -> extractIntegers(value).get(0);
case LONG -> !extractLongs(value).isEmpty() ? extractLongs(value).get(0) : Long.MIN_VALUE;
case FLOAT -> !extractFloats(value).isEmpty() ? extractFloats(value).get(0) : Float.MIN_VALUE;
case DOUBLE -> !extractDecimals(value).isEmpty() ? extractDecimals(value).get(0) : Double.MIN_VALUE;
case STRING ->
value.length() > 1 ? new Word(value).remove("\"", value.length() - 2).remove("\"").replaceAll("@10", "\n").replaceAll("@09", "\t").get() : value;
default -> null;
};
switch (getType(value)) {
case BOOLEAN: return value.contentEquals("true");
case INTEGER: return extractIntegers(value).get(0);
case LONG: return !extractLongs(value).isEmpty() ? extractLongs(value).get(0) : Long.MIN_VALUE;
case FLOAT: return !extractFloats(value).isEmpty() ? extractFloats(value).get(0) : Float.MIN_VALUE;
case DOUBLE: return !extractDecimals(value).isEmpty() ? extractDecimals(value).get(0) : Double.MIN_VALUE;
case STRING: return value.length() > 1 ? new Word(value).remove("\"", value.length() - 2).remove("\"").replaceAll("@10", "\n").replaceAll("@09", "\t").get() : value;
default: return null;
}
}


Expand Down
42 changes: 21 additions & 21 deletions src/main/java/nx/peter/java/util/data/FractionData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,27 +92,27 @@ public static FractionData toFractionData(Fraction data) {
}

public Fraction getFraction() {
return switch (data) {
case "⅙" -> new Fraction(1, 6);
case "⅐" -> new Fraction(1, 7);
case "⅛" -> new Fraction(1, 8);
case "⅑" -> new Fraction(1, 9);
case "⅒" -> new Fraction(1, 10);
case "½" -> new Fraction(1, 2);
case "⅓" -> new Fraction(1, 3);
case "¼" -> new Fraction(1, 4);
case "⅕" -> new Fraction(1, 5);
case "⅔" -> new Fraction(2, 3);
case "⅖" -> new Fraction(2, 5);
case "¾" -> new Fraction(3, 4);
case "⅗" -> new Fraction(3, 5);
case "⅜" -> new Fraction(3, 8);
case "⅘" -> new Fraction(4, 5);
case "⅚" -> new Fraction(5, 6);
case "⅝" -> new Fraction(5, 8);
case "⅞" -> new Fraction(7, 8);
default -> new Fraction(0);
};
switch (data) {
case "⅙": return new Fraction(1, 6);
case "⅐": return new Fraction(1, 7);
case "⅛": return new Fraction(1, 8);
case "⅑": return new Fraction(1, 9);
case "⅒": return new Fraction(1, 10);
case "½": return new Fraction(1, 2);
case "⅓": return new Fraction(1, 3);
case "¼": return new Fraction(1, 4);
case "⅕": return new Fraction(1, 5);
case "⅔": return new Fraction(2, 3);
case "⅖": return new Fraction(2, 5);
case "¾": return new Fraction(3, 4);
case "⅗": return new Fraction(3, 5);
case "⅜": return new Fraction(3, 8);
case "⅘": return new Fraction(4, 5);
case "⅚": return new Fraction(5, 6);
case "⅝": return new Fraction(5, 8);
case "⅞": return new Fraction(7, 8);
default: return new Fraction(0);
}
}

public boolean isInteger() {
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/nx/peter/java/util/data/ISentence.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void hasError(SentenceError error, OnCheckErrorListener listener) {
AtomicBoolean exists = new AtomicBoolean(false);
Thread checker = new Thread(() -> {
switch (error) {
case SyntaxError -> {
case SyntaxError: {
if (data.contains(" "))
exists.set(true);
else
Expand All @@ -116,7 +116,8 @@ public void hasError(SentenceError error, OnCheckErrorListener listener) {
break;
}
}
case GrammaticalError -> {
break;
case GrammaticalError: {
String OTHERS = "the he she a her him they them we to though thorough our ours you yours their theirs there over above";
for (Word w : getWords())
if (!w.isEmpty() && !new WordDictionary().containsWord(w) && !OTHERS.contains(new Word(w.get()).toLowerCase().get())) {
Expand Down Expand Up @@ -245,7 +246,7 @@ public void scanForError(SentenceError error, OnScanErrorListener listener) {

Thread scanner = new Thread(() -> {
switch (error) {
case SyntaxError -> {
case SyntaxError: {
if (data.contains(" ")) {
int start, end = 0;
while (true) {
Expand Down Expand Up @@ -310,8 +311,8 @@ public void scanForError(SentenceError error, OnScanErrorListener listener) {
}
}
}
}
case GrammaticalError -> {
} break;
case GrammaticalError: {
String OTHERS = "the he she a her him they them we to though thorough our ours you yours their theirs there over above";
for (Word w : getWords())
if (!w.isEmpty() && !w.contains('-') && !new WordDictionary().containsWord(w) && !OTHERS.contains(new Word(w.get()).toLowerCase().get())) {
Expand Down
41 changes: 18 additions & 23 deletions src/main/java/nx/peter/java/util/data/encryption/Password.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ public static Password generate(int length, Restriction restriction){
while(password.length() < length){
int type = Random.nextInt(2);
switch (type) {
case 0 -> all = DataManager.ALPHABETS;
case 1 -> all = DataManager.NUMBERS;
case 0: all = DataManager.ALPHABETS; break;
case 1: all = DataManager.NUMBERS;
}
password.append(all.charAt(Random.nextInt(all.length() - 1)));
if(password.length() == length && !followsRestriction(password.toString(), Restriction.AlphaNumeric))
Expand All @@ -167,11 +167,8 @@ public static Password generate(int length, Restriction restriction){
while(password.length() < length){
int type = Random.nextInt(2);
switch (type) {
case 0:
all = DataManager.SPECIAL_CHARACTERS;
break;
case 1:
all = DataManager.ALPHABETS;
case 0: all = DataManager.SPECIAL_CHARACTERS; break;
case 1: all = DataManager.ALPHABETS;
}
password.append(all.charAt(Random.nextInt(all.length() - 1)));
if(password.length() == length && !followsRestriction(password.toString(), Restriction.AlphaCharacter))
Expand All @@ -182,11 +179,10 @@ public static Password generate(int length, Restriction restriction){
case CharNumeric:
while(password.length() < length){
int type = Random.nextInt(2);
all = switch (type) {
case 0 -> DataManager.SPECIAL_CHARACTERS;
case 1 -> DataManager.NUMBERS;
default -> all;
};
switch (type) {
case 0: all = DataManager.SPECIAL_CHARACTERS; break;
case 1: all = DataManager.NUMBERS;
}
password.append(all.charAt(Random.nextInt(all.length() - 1)));
if(password.length() == length && !followsRestriction(password.toString(), Restriction.CharNumeric))
password = new StringBuilder();
Expand All @@ -205,12 +201,11 @@ public static Password generate(int length, Restriction restriction){
case All:
while(password.length() < length){
int type = Random.nextInt(3);
all = switch (type) {
case 0 -> DataManager.ALPHABETS;
case 1 -> DataManager.SPECIAL_CHARACTERS;
case 2 -> DataManager.NUMBERS;
default -> all;
};
switch (type) {
case 0: all = DataManager.ALPHABETS; break;
case 1: all = DataManager.SPECIAL_CHARACTERS; break;
case 2: all = DataManager.NUMBERS;
}
password.append(all.charAt(Random.nextInt(all.length() - 1)));
if(password.length() == length && !followsRestriction(password.toString(), Restriction.All))
password = new StringBuilder();
Expand Down Expand Up @@ -340,11 +335,11 @@ else if(hasCharacter(password) && !hasNumber(password) && !hasAlphabet(password)
}

private String getMessage(LengthVariant variant){
return switch (variant) {
case Greater -> "not greater than/equal to";
case Less -> "not less than/equal to";
default -> "not equal to";
};
switch (variant) {
case Greater: return "not greater than/equal to";
case Less: return "not less than/equal to";
default: return "not equal to";
}
}

private static boolean hasCharacter(CharSequence letters){
Expand Down

0 comments on commit f5f214b

Please sign in to comment.