Skip to content

Commit daafe0a

Browse files
authored
Merge pull request #490 from mortend/whitespace
whitespace fix-up pass (beta-3.0)
2 parents 8b07607 + 3ca91eb commit daafe0a

File tree

1,086 files changed

+8008
-8008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,086 files changed

+8008
-8008
lines changed

CHANGELOG.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ If you run into trouble, make sure you have installed [JDK 11](https://adoptium.
287287

288288
### Compiler
289289
- Fixed bug with `abstract extern` members (#273).
290-
- Dropped legacy importer system (#272).
290+
- Dropped legacy importer system (#272).
291291
- Auto-detect main-class when building a library.
292292

293293
### Standard library
@@ -1009,7 +1009,7 @@ The native Android-theme used by an app has been made configurable, by adjusting
10091009
To get the old behavior, add this snippet to your project file:
10101010

10111011
"Android": {
1012-
"Theme" : "Holo"
1012+
"Theme" : "Holo"
10131013
}
10141014

10151015
0.44
@@ -1103,7 +1103,7 @@ This series of changes are seen as steps to enable where we want to go, we under
11031103
@}
11041104
}
11051105

1106-
On foreign Java methods you can also provide annotations.
1106+
On foreign Java methods you can also provide annotations.
11071107

11081108
[ForeignAnnotation(Language.Java, "TargetApi(19)")]
11091109
public void Foo()
@@ -1776,24 +1776,24 @@ You can now create `ux:Global` objects of value types, such as `float4`. This is
17761776
- Added support for `ux:InnerClass`, which is a class that has access to named UX objects in its scope.
17771777
Specifically, the differences are:
17781778

1779-
ux:Class
1779+
ux:Class
17801780

1781-
Declares a global class that can be used anywhere.
1782-
Such classes have no access to ux:Names the scope in which they are declared.
1781+
Declares a global class that can be used anywhere.
1782+
Such classes have no access to ux:Names the scope in which they are declared.
17831783

1784-
ux:InnerClass
1784+
ux:InnerClass
17851785

1786-
Declares a class that can only be used in the scope where it is declared.
1787-
In return, it has full access to all ux:Names in the scope it is declared.
1786+
Declares a class that can only be used in the scope where it is declared.
1787+
In return, it has full access to all ux:Names in the scope it is declared.
17881788

1789-
Inner classes can be extracted into separate .ux files, and then included
1790-
using <ux:Include File="Foo.ux"> in the scope you want to use it.
1789+
Inner classes can be extracted into separate .ux files, and then included
1790+
using <ux:Include File="Foo.ux"> in the scope you want to use it.
17911791

1792-
Inner classes can not specify namespaces, they will implicitly be in the
1793-
name scope of their containing class.
1792+
Inner classes can not specify namespaces, they will implicitly be in the
1793+
name scope of their containing class.
17941794

1795-
If root nodes are marked ux:InnerClass, they are ignored by the UX compiler
1796-
unless ux:Included somewhere.
1795+
If root nodes are marked ux:InnerClass, they are ignored by the UX compiler
1796+
unless ux:Included somewhere.
17971797

17981798
### Foreign code
17991799

docs/coding-style.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ but we also have a few additional guidelines:
4242
```Uno
4343
class Foo
4444
{
45-
int _bar;
45+
int _bar;
4646
}
4747
```
4848
* *Do not* use Egyptian braces

lib/Uno.Graphics.Utils/TextureLoader.uno

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace Uno.Graphics.Utils
6767
return DotNetTexture.Load2D("image.png", bytes);
6868
else
6969
throw new NotImplementedException();
70-
}
70+
}
7171
catch (Exception pngException)
7272
{
7373
// both threw, but since the user asked for JPEG, answer with the JPEG-error

lib/Uno.Net.Http/HttpMessageHandlerRequest.uno

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ namespace Uno.Net.Http
203203
{
204204
if(_request.IsComplete())
205205
return;
206-
206+
207207
_request.State = _state;
208208
_action(_request, _current, _total, _hasTotal);
209209
}

lib/Uno.Net.Http/android/ExperimentalHttp/DownloadTask.java

+38-38
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,48 @@
55
import android.os.AsyncTask;
66

77
public class DownloadTask extends AsyncTask<Object, Void, Void> {
8-
public HttpRequest request;
8+
public HttpRequest request;
99
StringBuilder stringResult;
10-
@Override
11-
protected Void doInBackground(Object... params) {
12-
request = (HttpRequest)params[1];
10+
@Override
11+
protected Void doInBackground(Object... params) {
12+
request = (HttpRequest)params[1];
1313

14-
try {
15-
InputStream stream = (InputStream)params[0];
14+
try {
15+
InputStream stream = (InputStream)params[0];
1616

17-
int nRead;
18-
int runningTotal = 0;
19-
int progressThreshold = 30000;
20-
int steps = 1;
21-
byte[] data = new byte[16384];
17+
int nRead;
18+
int runningTotal = 0;
19+
int progressThreshold = 30000;
20+
int steps = 1;
21+
byte[] data = new byte[16384];
2222
stringResult = new StringBuilder();
2323

24-
while ((nRead = stream.read(data, 0, data.length)) != -1) {
25-
if (request._responseType == HttpRequest.HttpResponseTypeByteArray) {
26-
request.OnDataReceived(data, nRead);
27-
} else {
24+
while ((nRead = stream.read(data, 0, data.length)) != -1) {
25+
if (request._responseType == HttpRequest.HttpResponseTypeByteArray) {
26+
request.OnDataReceived(data, nRead);
27+
} else {
2828
stringResult.append(new String(data,0,nRead));
29-
}
30-
runningTotal+=nRead;
31-
if (runningTotal/progressThreshold > steps)
32-
{
33-
steps = runningTotal/progressThreshold;
34-
request.OnProgress(runningTotal, 0, false);
35-
}
36-
}
37-
} catch (IOException e) {
38-
request.OnError("IOException (AsyncInputStreamToBytesTask): "+e.getLocalizedMessage());
39-
}
40-
return null;
41-
}
42-
@Override
43-
protected void onPostExecute(Void ignore)
44-
{
45-
if (request._responseType == HttpRequest.HttpResponseTypeByteArray) {
46-
request.OnDataReceived(null, -1);
47-
} else {
48-
request.CacheResponseString(stringResult.toString());
49-
}
50-
request.DownloadDone();
51-
}
29+
}
30+
runningTotal+=nRead;
31+
if (runningTotal/progressThreshold > steps)
32+
{
33+
steps = runningTotal/progressThreshold;
34+
request.OnProgress(runningTotal, 0, false);
35+
}
36+
}
37+
} catch (IOException e) {
38+
request.OnError("IOException (AsyncInputStreamToBytesTask): "+e.getLocalizedMessage());
39+
}
40+
return null;
41+
}
42+
@Override
43+
protected void onPostExecute(Void ignore)
44+
{
45+
if (request._responseType == HttpRequest.HttpResponseTypeByteArray) {
46+
request.OnDataReceived(null, -1);
47+
} else {
48+
request.CacheResponseString(stringResult.toString());
49+
}
50+
request.DownloadDone();
51+
}
5252
}

0 commit comments

Comments
 (0)