ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases 8 Packages Wiki Activity

Fixed #46! The char remove still WIP

Browse source
This commit is contained in:
Norbi Peti 2016-10-01 19:10:50 +02:00
parent 798e5903de
commit c4e22a779e
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/buttondevteam/chat/formatting/ChatFormatter.java
View file

@ -63,7 +63,19 @@ public final class ChatFormatter {
if (sections.size() < 2) if (sections.size() < 2)
break; break;
DebugCommand.SendDebugMessage("i: " + i); DebugCommand.SendDebugMessage("i: " + i);
if (sections.get(i - 1).End > sections.get(i).Start && sections.get(i - 1).Start < sections.get(i).End) { if (sections.get(i - 1).Start == sections.get(i).Start && sections.get(i - 1).End == sections.get(i).End) {
DebugCommand.SendDebugMessage("Combining sections " + sections.get(i - 1) + " and " + sections.get(i));
sections.get(i - 1).Formatters.addAll(sections.get(i).Formatters);
sections.get(i - 1).Matches.addAll(sections.get(i).Matches);
if (sections.get(i - 1).RemCharFromStart < sections.get(i).RemCharFromStart)
sections.get(i - 1).RemCharFromStart = sections.get(i).RemCharFromStart;
if (sections.get(i - 1).RemCharFromEnd < sections.get(i).RemCharFromEnd)
sections.get(i - 1).RemCharFromEnd = sections.get(i).RemCharFromEnd;
DebugCommand.SendDebugMessage("To section " + sections.get(i - 1));
sections.remove(i);
found = true;
} else if (sections.get(i - 1).End > sections.get(i).Start
&& sections.get(i - 1).Start < sections.get(i).End) {
DebugCommand.SendDebugMessage("Combining sections " + sections.get(i - 1) + " and " + sections.get(i)); DebugCommand.SendDebugMessage("Combining sections " + sections.get(i - 1) + " and " + sections.get(i));
int origend = sections.get(i - 1).End; int origend = sections.get(i - 1).End;
sections.get(i - 1).End = sections.get(i).Start - 1; sections.get(i - 1).End = sections.get(i).Start - 1;
@ -75,7 +87,7 @@ public final class ChatFormatter {
origend2 = tmp; origend2 = tmp;
} }
FormattedSection section = new FormattedSection(sections.get(i - 1).Formatters, sections.get(i).Start, FormattedSection section = new FormattedSection(sections.get(i - 1).Formatters, sections.get(i).Start,
origend, sections.get(i - 1).Matches, sections.get(i - 1).RemCharFromStart, origend, sections.get(i - 1).Matches, sections.get(i).RemCharFromStart,
sections.get(i - 1).RemCharFromEnd, sections.get(i - 1).RemCharPos); // TODO: RemCharPos sections.get(i - 1).RemCharFromEnd, sections.get(i - 1).RemCharPos); // TODO: RemCharPos
section.Formatters.addAll(sections.get(i).Formatters); // TODO: Add remove counts to every part, then check if they have duplicates section.Formatters.addAll(sections.get(i).Formatters); // TODO: Add remove counts to every part, then check if they have duplicates
section.Matches.addAll(sections.get(i).Matches); // TODO: Clean section.Matches.addAll(sections.get(i).Matches); // TODO: Clean
@ -87,8 +99,12 @@ public final class ChatFormatter {
thirdFormattedSection.Formatters.addAll(sections.get(i - 1).Formatters); thirdFormattedSection.Formatters.addAll(sections.get(i - 1).Formatters);
thirdFormattedSection.Matches.clear(); thirdFormattedSection.Matches.clear();
thirdFormattedSection.Matches.addAll(sections.get(i - 1).Matches); thirdFormattedSection.Matches.addAll(sections.get(i - 1).Matches);
thirdFormattedSection.RemCharFromEnd = sections.get(i - 1).RemCharFromEnd; short remchar = section.RemCharFromEnd;
section.RemCharFromEnd = thirdFormattedSection.RemCharFromEnd;
thirdFormattedSection.RemCharFromEnd = remchar;
} }
sections.get(i - 1).RemCharFromEnd = 0;
thirdFormattedSection.RemCharFromStart = 0;
thirdFormattedSection.Start = origend + 1; thirdFormattedSection.Start = origend + 1;
thirdFormattedSection.End = origend2; thirdFormattedSection.End = origend2;
DebugCommand.SendDebugMessage("To sections 1:" + sections.get(i - 1) + ""); DebugCommand.SendDebugMessage("To sections 1:" + sections.get(i - 1) + "");
@ -96,18 +112,6 @@ public final class ChatFormatter {
DebugCommand.SendDebugMessage(" 3:" + thirdFormattedSection); DebugCommand.SendDebugMessage(" 3:" + thirdFormattedSection);
found = true; found = true;
} }
if (sections.get(i - 1).Start == sections.get(i).Start && sections.get(i - 1).End == sections.get(i).End) {
DebugCommand.SendDebugMessage("Combining sections " + sections.get(i - 1) + " and " + sections.get(i));
sections.get(i - 1).Formatters.addAll(sections.get(i).Formatters);
sections.get(i - 1).Matches.addAll(sections.get(i).Matches);
DebugCommand.SendDebugMessage("To section " + sections.get(i - 1));
sections.remove(i);
if (sections.get(i - 1).RemCharFromStart < sections.get(i).RemCharFromStart)
sections.get(i - 1).RemCharFromStart = sections.get(i).RemCharFromStart;
if (sections.get(i - 1).RemCharFromEnd < sections.get(i).RemCharFromEnd)
sections.get(i - 1).RemCharFromEnd = sections.get(i).RemCharFromEnd;
found = true;
}
for (int j = i - 1; j <= i + 1; j++) { for (int j = i - 1; j <= i + 1; j++) {
if (j < sections.size() && sections.get(j).End < sections.get(j).Start) { if (j < sections.size() && sections.get(j).End < sections.get(j).Start) {
DebugCommand.SendDebugMessage("Removing section: " + sections.get(j)); DebugCommand.SendDebugMessage("Removing section: " + sections.get(j));
@ -135,7 +139,7 @@ public final class ChatFormatter {
FormattedSection section = sections.get(i); FormattedSection section = sections.get(i);
DebugCommand.SendDebugMessage("Applying section: " + section); DebugCommand.SendDebugMessage("Applying section: " + section);
String originaltext; String originaltext;
int start = section.Start - section.RemCharFromStart, end = section.End + 1 - section.RemCharFromEnd; // TODO: RemCharPos int start = section.Start + section.RemCharFromStart, end = section.End + 1 - section.RemCharFromEnd; // TODO: RemCharPos
originaltext = str.substring(start, end); originaltext = str.substring(start, end);
DebugCommand.SendDebugMessage("Originaltext: " + originaltext); DebugCommand.SendDebugMessage("Originaltext: " + originaltext);
Color color = null; Color color = null;

2
src/main/java/buttondevteam/chat/formatting/FormattedSection.java
View file

@ -37,7 +37,7 @@ class FormattedSection {
@Override @Override
public String toString() { public String toString() {
return new StringBuilder("Section(").append(Start).append(", ").append(End).append(", formatters: ") return new StringBuilder("Section(").append(Start).append(", ").append(End).append(", formatters: ")
.append(Formatters.toString()).append(", matches: ").append(Matches.toString()).append("RemChars: ") .append(Formatters.toString()).append(", matches: ").append(Matches.toString()).append(", RemChars: ")
.append(RemCharFromStart).append(", ").append(RemCharFromEnd).append(", ").append(RemCharPos) .append(RemCharFromStart).append(", ").append(RemCharFromEnd).append(", ").append(RemCharPos)
.append(")").toString(); .append(")").toString();
} }