Skip to content

Commit

Permalink
fixed nameresolver, satisfied with minor version
Browse files Browse the repository at this point in the history
  • Loading branch information
litoj committed Jan 15, 2022
1 parent 44a568b commit ebca283
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 20 deletions.
Binary file modified Android app/app/libs/SMLib.jar
Binary file not shown.
Binary file modified Android app/app/libs/SMLib.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ public View onCreateView(@NonNull LayoutInflater inflater,
String[][] releases = {
{"1.6.2", "- popup background now does nothing\n" +
"- fixed description not updating\n" +
"- test time now calculated based on time set for one item"},
"- test time now calculated based on time set for one item\n" +
"- fixed minor bugs in name-resloving engine"},
{"1.6.1", "- reworked and improved word name resolving features, now more robust"},
{"1.6.0", "- reworked and improved simple word exports, now more robust"},
{"1.5.2", "- altered filesystem usage to handle Android 10+ Storage access framework"},
Expand Down
4 changes: 2 additions & 2 deletions Library/nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ is divided into following sections:
<property file="${user.properties.file}"/>
<!-- The two properties below are usually overridden -->
<!-- by the active platform. Just a fallback. -->
<property name="default.javac.source" value="1.6"/>
<property name="default.javac.target" value="1.6"/>
<property name="default.javac.source" value="1.8"/>
<property name="default.javac.target" value="1.8"/>
</target>
<target depends="-pre-init,-init-private,-init-user" name="-init-project">
<property file="nbproject/configs/${config}.properties"/>
Expand Down
4 changes: 2 additions & 2 deletions Library/nbproject/genfiles.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ [email protected]
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=aa72e7c2
nbproject/build-impl.xml.script.CRC32=a74cab49
nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.98.0.48
nbproject/build-impl.xml.script.CRC32=a091119a
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.101.0.48
2 changes: 1 addition & 1 deletion Library/nbproject/private/private.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ do.jlink=false
javac.debug=true
javadoc.preview=true
jlink.strip=false
user.properties.file=/home/kepis/.netbeans/12.4/build.properties
user.properties.file=/home/kepis/.netbeans/12.6/build.properties
6 changes: 1 addition & 5 deletions Library/nbproject/private/private.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/home/kepis/Documents/PG/JavaProjects/SchoolManager/Library/src/IOSystem/Formatter.java</file>
<file>file:/home/kepis/Documents/PG/JavaProjects/SchoolManager/Library/src/testing/Test.java</file>
<file>file:/home/kepis/Documents/PG/JavaProjects/SchoolManager/Library/src/testing/Timer.java</file>
</group>
<group/>
</open-files>
</project-private>
19 changes: 10 additions & 9 deletions Library/src/testing/NameReader.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package testing;

import java.util.ArrayList;
import java.util.LinkedList;

import java.util.List;
import objects.templates.BasicData;
Expand Down Expand Up @@ -57,7 +56,7 @@ public static String[] readName(Object o) {

public static void main(String[] args) {
// for(String str : readName("(/(1a/2(1b/2b B)a/3(1b/2(1c/2(1 D)c/3c C)b)a ))A")) System.out.println(str);
// for(String str : readName("0 1a\\/1b 2a/2b.")) System.out.println(str);
// for(String str : readName("0 1(b/c)a 2a/2b")) System.out.println(str);
}

private void getParts(List<StringBuilder> ret) {
Expand Down Expand Up @@ -91,22 +90,22 @@ private void getParts(List<StringBuilder> ret) {
case ',':
case ' ':
if (parts == null) {
sb.append(now);
if (recursiveParts == null) {
sb.append(now);
if (ret.isEmpty()) ret.add(sb);
else for (StringBuilder part : ret) if (sb.length() > 0) part.append(sb);
sb = new StringBuilder(8);
} else {
if (ret.isEmpty()) for (StringBuilder part : recursiveParts)
ret.add(part.length() > 0 ? part.append(sb) : part);
ret.add(part.append(sb).append(now));
else {
int size = ret.size();
StringBuilder retPart;
for (int j = 0; j < size; j++) {
retPart = ret.remove(0);
for (StringBuilder part : recursiveParts)
ret.add(part.length() > 0 ? new StringBuilder(retPart).append(part).append(now)
: new StringBuilder(retPart).append(part));
ret.add(part.length() > 0 ? new StringBuilder(retPart).append(part).append(sb).append(now)
: new StringBuilder(retPart).append(sb));
}
}
sb.setLength(0);
Expand Down Expand Up @@ -168,8 +167,9 @@ private void getParts(List<StringBuilder> ret) {
if (ret.isEmpty()) for (StringBuilder part : recursiveParts) ret.add(part.append(sb));
else {
int size = ret.size();
StringBuilder retPart;
for (int j = 0; j < size; j++) {
StringBuilder retPart = ret.remove(j);
retPart = ret.remove(0);
for (StringBuilder part : recursiveParts) {
ret.add(new StringBuilder(retPart).append(part).append(sb));
}
Expand All @@ -182,12 +182,13 @@ private void getParts(List<StringBuilder> ret) {
else for (StringBuilder part : recursiveParts) parts.add(part.append(sb));
} else if (recursiveParts != null) {
for (StringBuilder part : recursiveParts) parts.add(part);
}
} else parts.add(sb);
if (ret.isEmpty()) for (StringBuilder part : parts) ret.add(part);
else {
int size = ret.size();
StringBuilder retPart;
for (int j = 0; j < size; j++) {
StringBuilder retPart = ret.remove(j);
retPart = ret.remove(0);
for (StringBuilder part : parts) {
ret.add(new StringBuilder(retPart).append(part));
}
Expand Down
Binary file modified SchoolManager.apk
Binary file not shown.

0 comments on commit ebca283

Please sign in to comment.