Skip to content

Remove explicit keyword and HashMap toString with ArrayList #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TuanAnhNguyen69 merged 1 commit into from
Oct 19, 2017
Merged

Remove explicit keyword and HashMap toString with ArrayList #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions java/lang/String/String.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,31 +125,31 @@ namespace Java {
*
* @param byteArray
*/
explicit String(Array<byte> &byteArray);
String(Array<byte> &byteArray);

/**
* Allocates a new String that contains the sequence
* of characters currently contained in the StringBuilder.
*
* @param stringBuilder
*/
explicit String(const StringBuilder &stringBuilder);
String(const StringBuilder &stringBuilder);

/**
* Allocates a new String so that it represents the sequence
* of characters currently contained in the character array argument.
*
* @param charArray
*/
explicit String(Array<char> &charArray);
String(Array<char> &charArray);

/**
* Allocates a new String that contains the sequence
* of characters currently contained in the StringBuffer.
*
* @param stringBuffer
*/
explicit String(const StringBuffer &stringBuffer);
String(const StringBuffer &stringBuffer);

/**
* Constructs a new String by decoding the specified array of bytes
Expand Down Expand Up @@ -181,7 +181,7 @@ namespace Java {
* @throw IndexOutOfBoundsException If the offset and count arguments index
* characters outside the bounds of the value array
*/
explicit String(Array<char> &charArray, int offset, int count);
String(Array<char> &charArray, int offset, int count);

/**
* Allocates a new String that contains characters
Expand All @@ -208,7 +208,7 @@ namespace Java {
* @throwIndexOutOfBoundsException If the offset and the length arguments index
* characters outside the bounds of the bytes array
*/
explicit String(Array<byte> &byteArray, int offset, int length);
String(Array<byte> &byteArray, int offset, int length);

/**
* Constructs a new String by decoding the specified
Expand Down
2 changes: 2 additions & 0 deletions java/util/HashMap/HashMap.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,8 @@ namespace Java {
startHashMap += endString;
startHashMap = startHashMap.replaceAll("}\"", "}");
startHashMap = startHashMap.replaceAll("\"{", "{");
startHashMap = startHashMap.replaceAll("]\"", "]");
startHashMap = startHashMap.replaceAll("\"[", "[");
this->backup = startHashMap;
return this->backup.toString();
}
Expand Down