Skip to content

Commit 107e9a9

Browse files
nedtwiggnedtwigg
committed
Blowdryer'ed spotless (which brings a license header bump and import sort).
1 parent 27bfd8b commit 107e9a9

File tree

78 files changed

+402
-420
lines changed

Some content is hidden

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

78 files changed

+402
-420
lines changed

‎build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ apply from: 干.file('helper/javadoc-markdown.gradle')
1414

1515
subprojects { subProject ->
1616
apply from: 干.file('base/java8.gradle')
17+
apply from: 干.file('spotless/java.gradle')
1718

1819
ext.maven_name = subProject.name
1920
ext.javadoc_links = [

‎durian-swt.cocoa.macosx.x86_64/src/main/java/com/diffplug/common/swt/widgets/SmoothTable.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.widgets;
1717

18+
1819
import org.eclipse.swt.internal.cocoa.NSPoint;
1920
import org.eclipse.swt.widgets.Composite;
2021

‎durian-swt.gtk.linux.x86/src/main/java/com/diffplug/common/swt/widgets/SmoothTable.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.widgets;
1717

18+
1819
import org.eclipse.swt.widgets.Composite;
1920

2021
public final class SmoothTable extends AbstractSmoothTable.Scrollable {

‎durian-swt.gtk.linux.x86_64/src/main/java/com/diffplug/common/swt/widgets/SmoothTable.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.widgets;
1717

18+
1819
import org.eclipse.swt.widgets.Composite;
1920

2021
public final class SmoothTable extends AbstractSmoothTable.Scrollable {

‎durian-swt.os/src/main/java/com/diffplug/common/swt/os/Arch.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎durian-swt.os/src/main/java/com/diffplug/common/swt/os/OS.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.os;
1717

18+
1819
import java.util.Arrays;
1920
import java.util.Locale;
2021

‎durian-swt.os/src/main/java/com/diffplug/common/swt/os/SwtPlatform.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.os;
1717

18+
1819
import java.util.Arrays;
1920
import java.util.HashMap;
2021
import java.util.LinkedHashMap;

‎durian-swt.os/src/main/java/com/diffplug/common/swt/os/WS.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,

‎durian-swt.os/src/main/java/com/diffplug/common/swt/os/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@ParametersAreNonnullByDefault
22
package com.diffplug.common.swt.os;
33

4+
45
import javax.annotation.ParametersAreNonnullByDefault;

‎durian-swt.os/src/test/java/com/diffplug/common/swt/os/SwtPlatformTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.os;
1717

18+
1819
import org.junit.Assert;
1920
import org.junit.Test;
2021

‎durian-swt.win32.win32.x86/src/main/java/com/diffplug/common/swt/widgets/SmoothTable.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.widgets;
1717

18+
1819
import org.eclipse.swt.widgets.Composite;
1920

2021
public final class SmoothTable extends AbstractSmoothTable.Unscrollable {

‎durian-swt.win32.win32.x86_64/src/main/java/com/diffplug/common/swt/widgets/SmoothTable.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt.widgets;
1717

18+
1819
import org.eclipse.swt.widgets.Composite;
1920

2021
public final class SmoothTable extends AbstractSmoothTable.Unscrollable {

‎durian-swt/build.gradle

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
apply plugin: 'com.diffplug.gradle.eclipse.mavencentral'
2-
eclipseMavenCentral { release SWT_VERSION, {
3-
implementation 'org.eclipse.swt'
4-
implementation 'org.eclipse.jface'
5-
useNativesForRunningPlatform()
6-
} }
2+
eclipseMavenCentral {
3+
release SWT_VERSION, {
4+
implementation 'org.eclipse.swt'
5+
implementation 'org.eclipse.jface'
6+
useNativesForRunningPlatform()
7+
}
8+
}
79
dependencies {
810
implementation project(':durian-swt.os')
911
implementation "com.diffplug.durian:durian-rx:$VER_DURIAN_RX"

‎durian-swt/src/main/java/com/diffplug/common/swt/Coat.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,8 @@
1515
*/
1616
package com.diffplug.common.swt;
1717

18-
import javax.annotation.Nullable;
1918

19+
import javax.annotation.Nullable;
2020
import org.eclipse.swt.widgets.Composite;
2121

2222
/**

‎durian-swt/src/main/java/com/diffplug/common/swt/CoatMux.java

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,22 +15,20 @@
1515
*/
1616
package com.diffplug.common.swt;
1717

18+
19+
import com.diffplug.common.base.Preconditions;
20+
import com.diffplug.common.rx.Chit;
21+
import com.diffplug.common.rx.Rx;
22+
import com.diffplug.common.rx.RxBox;
23+
import com.diffplug.common.rx.RxGetter;
1824
import java.util.Optional;
1925
import java.util.function.Function;
20-
2126
import javax.annotation.Nullable;
22-
2327
import org.eclipse.swt.SWT;
2428
import org.eclipse.swt.custom.StackLayout;
2529
import org.eclipse.swt.widgets.Composite;
2630
import org.eclipse.swt.widgets.Control;
2731

28-
import com.diffplug.common.base.Preconditions;
29-
import com.diffplug.common.rx.Chit;
30-
import com.diffplug.common.rx.Rx;
31-
import com.diffplug.common.rx.RxBox;
32-
import com.diffplug.common.rx.RxGetter;
33-
3432
/** A widget that switches between multiple `Coat`s. */
3533
@SwtThread
3634
public class CoatMux extends ControlWrapper.AroundControl<Composite> {

‎durian-swt/src/main/java/com/diffplug/common/swt/ColorPool.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,16 +15,15 @@
1515
*/
1616
package com.diffplug.common.swt;
1717

18-
import java.util.HashMap;
1918

19+
import com.diffplug.common.collect.Maps;
20+
import java.util.HashMap;
2021
import org.eclipse.swt.SWT;
2122
import org.eclipse.swt.graphics.Color;
2223
import org.eclipse.swt.graphics.RGB;
2324
import org.eclipse.swt.widgets.Display;
2425
import org.eclipse.swt.widgets.Widget;
2526

26-
import com.diffplug.common.collect.Maps;
27-
2827
/** Caches {@link Color}s, and automatically manages their disposal. */
2928
public class ColorPool {
3029
private final HashMap<RGB, Color> colorTable = Maps.newHashMap();

‎durian-swt/src/main/java/com/diffplug/common/swt/ColumnFormat.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +15,13 @@
1515
*/
1616
package com.diffplug.common.swt;
1717

18+
1819
import java.util.ArrayList;
1920
import java.util.Collections;
2021
import java.util.List;
2122
import java.util.Optional;
2223
import java.util.function.Function;
2324
import java.util.stream.Collectors;
24-
2525
import org.eclipse.jface.layout.AbstractColumnLayout;
2626
import org.eclipse.jface.layout.TableColumnLayout;
2727
import org.eclipse.jface.layout.TreeColumnLayout;

‎durian-swt/src/main/java/com/diffplug/common/swt/ControlWrapper.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* Copyright 2018 DiffPlug
2+
* Copyright 2020 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* https://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.common.swt;
1717

18+
1819
import org.eclipse.swt.widgets.Composite;
1920
import org.eclipse.swt.widgets.Control;
2021
import org.eclipse.swt.widgets.Shell;

0 commit comments

Comments
 (0)