michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting some new graphics classes back to how they were on master.

Browse Source
This commit is contained in:
Calum
2017-07-31 23:35:28 +12:00
parent b82d0d0137
commit 47c5e6f155
8 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/model/mark/CompoundMark.java
+7 -4
View File
@@ -1,6 +1,5 @@
package seng302.model.mark;
import com.sun.deploy.util.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -31,9 +30,13 @@ public class CompoundMark {
*/
@Override
public String toString(){
String info = String.format("CompoundMark: %d (%s), [", compoundMarkId, name);
info += StringUtils.join(marks, ", ") + "]";
return info;
String info = String.format(
"CompoundMark: %d (%s), [%s", compoundMarkId, name, marks.get(0).toString()
);
if (marks.size() > 1) {
info += String.format(", %s", marks.get(1).toString());
}
return info + "]";
}
public int getId() {