From e03f62da7f81d77248fde61ddc49a7ab1e041d3d Mon Sep 17 00:00:00 2001 From: DarkWeird Date: Mon, 30 Aug 2021 11:29:30 +0300 Subject: [PATCH 1/3] chore(tutorial): migrate tutorial modules with engine package movement --- .../org/terasology/tutorialnui/EnvironmentInfoScreen.java | 6 +++--- .../org/terasology/tutorialnui/widgets/UIBoxScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UIButtonScreen.java | 2 +- .../terasology/tutorialnui/widgets/UICheckboxScreen.java | 2 +- .../tutorialnui/widgets/UIDoubleSliderScreen.java | 2 +- .../terasology/tutorialnui/widgets/UIDropdownScreen.java | 2 +- .../tutorialnui/widgets/UIDropdownScrollableScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UIIconBarScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UIImageScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UILabelScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UIListScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UILoadBarScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UIRadialScreen.java | 2 +- .../terasology/tutorialnui/widgets/UIScrollbarScreen.java | 2 +- .../tutorialnui/widgets/UIScrollingTextScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UISliderScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UISpaceScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UITabBoxScreen.java | 2 +- .../org/terasology/tutorialnui/widgets/UITextScreen.java | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java b/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java index 6fe5643..c2d930f 100644 --- a/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java +++ b/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java @@ -15,9 +15,9 @@ */ package org.terasology.tutorialnui; -import org.terasology.engine.Time; -import org.terasology.registry.In; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.core.Time; +import org.terasology.engine.registry.In; +import org.terasology.engine.rendering.nui.CoreScreenLayer; import org.terasology.nui.widgets.UIButton; import org.terasology.nui.widgets.UIText; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java index 325b786..073e700 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIBoxScreen extends CoreScreenLayer { @Override diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java index 198ca59..9551a1c 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIButtonScreen extends CoreScreenLayer { @Override diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java index 871a1ea..698486f 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UICheckboxScreen extends CoreScreenLayer { @Override diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java index d877633..61c6a1f 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java @@ -16,7 +16,7 @@ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIDoubleSliderScreen extends CoreScreenLayer { @Override diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java index 669b6af..37436d5 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; import org.terasology.nui.widgets.UIDropdown; import java.util.ArrayList; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java index 6e78e60..54ffc39 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; import org.terasology.nui.widgets.UIDropdownScrollable; import java.util.ArrayList; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java index 5e8fefb..02f11fd 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIIconBarScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java index 2885289..3e25484 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIImageScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java index 2ca8471..ab7ac97 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UILabelScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java index 6f5e897..e9f5fe2 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; import org.terasology.nui.widgets.UIList; import java.util.ArrayList; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java index 4d7724b..46a5e5c 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UILoadBarScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java index f843dd2..3440b6c 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIRadialScreen extends CoreScreenLayer { @Override diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java index 8daea04..99d1298 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIScrollbarScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java index a10b292..4dc0dbc 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UIScrollingTextScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java index bab4d13..e746520 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UISliderScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java index 11cf8f7..9f9b5b0 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UISpaceScreen extends CoreScreenLayer { diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java index 5fe9a56..1879d3a 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UITabBoxScreen extends CoreScreenLayer { @Override diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java index 348d2e3..130a98d 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java @@ -15,7 +15,7 @@ */ package org.terasology.tutorialnui.widgets; -import org.terasology.rendering.nui.CoreScreenLayer; +import org.terasology.engine.rendering.nui.CoreScreenLayer; public class UITextScreen extends CoreScreenLayer { From 67978a7663662d436f9d78a9980b2f69c90d39fd Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Thu, 2 Sep 2021 23:52:35 +0200 Subject: [PATCH 2/3] style: update copyright and remove unused imports --- .../tutorialnui/EnvironmentInfoScreen.java | 17 ++--------------- .../tutorialnui/widgets/UIBoxScreen.java | 17 ++--------------- .../tutorialnui/widgets/UIButtonScreen.java | 17 ++--------------- .../tutorialnui/widgets/UICheckboxScreen.java | 17 ++--------------- .../widgets/UIDoubleSliderScreen.java | 17 ++--------------- .../tutorialnui/widgets/UIDropdownScreen.java | 2 +- .../widgets/UIDropdownScrollableScreen.java | 2 +- .../tutorialnui/widgets/UIIconBarScreen.java | 17 ++--------------- .../tutorialnui/widgets/UIImageScreen.java | 17 ++--------------- .../tutorialnui/widgets/UILabelScreen.java | 17 ++--------------- .../tutorialnui/widgets/UIListScreen.java | 17 ++--------------- .../tutorialnui/widgets/UILoadBarScreen.java | 17 ++--------------- .../tutorialnui/widgets/UIRadialScreen.java | 17 ++--------------- .../tutorialnui/widgets/UIScrollbarScreen.java | 17 ++--------------- .../widgets/UIScrollingTextScreen.java | 17 ++--------------- .../tutorialnui/widgets/UISliderScreen.java | 17 ++--------------- .../tutorialnui/widgets/UISpaceScreen.java | 17 ++--------------- .../tutorialnui/widgets/UITabBoxScreen.java | 17 ++--------------- .../tutorialnui/widgets/UITextScreen.java | 17 ++--------------- 19 files changed, 36 insertions(+), 257 deletions(-) diff --git a/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java b/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java index c2d930f..1e9414d 100644 --- a/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java +++ b/src/main/java/org/terasology/tutorialnui/EnvironmentInfoScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui; import org.terasology.engine.core.Time; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java index 073e700..2d5777a 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIBoxScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java index 9551a1c..c642b89 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIButtonScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java index 698486f..62c61a9 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java index 61c6a1f..7375a0b 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIDoubleSliderScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java index 37436d5..3683a0e 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScreen.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java index 54ffc39..6dd12a8 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java @@ -1,4 +1,4 @@ -// Copyright 2020 The Terasology Foundation +// Copyright 2021 The Terasology Foundation // SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java index 02f11fd..cd1ccdb 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIIconBarScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java index 3e25484..ff49eec 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIImageScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java index ab7ac97..7a48dd9 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UILabelScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java index e9f5fe2..5cce1bf 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIListScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java index 46a5e5c..10eb318 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UILoadBarScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java index 3440b6c..4073baf 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIRadialScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java index 99d1298..277e8c2 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollbarScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java index 4dc0dbc..40a7189 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIScrollingTextScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java index e746520..409e645 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UISliderScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java index 9f9b5b0..54c1b68 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UISpaceScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java index 1879d3a..9d5c40e 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java index 130a98d..9fc98e3 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UITextScreen.java @@ -1,18 +1,5 @@ -/* - * Copyright 2016 MovingBlocks - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 package org.terasology.tutorialnui.widgets; import org.terasology.engine.rendering.nui.CoreScreenLayer; From 245288b18122491291fabc7b1474b1411488146f Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Thu, 2 Sep 2021 23:54:53 +0200 Subject: [PATCH 3/3] style: fix remaining checkstyle warnings --- .../terasology/tutorialnui/widgets/UICheckboxScreen.java | 4 +--- .../tutorialnui/widgets/UIDropdownScrollableScreen.java | 6 ++++-- .../org/terasology/tutorialnui/widgets/UITabBoxScreen.java | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java index 62c61a9..9f5b888 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UICheckboxScreen.java @@ -6,7 +6,5 @@ public class UICheckboxScreen extends CoreScreenLayer { @Override - public void initialise(){ - - } + public void initialise() { } } diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java index 6dd12a8..41496fd 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UIDropdownScrollableScreen.java @@ -12,10 +12,12 @@ public class UIDropdownScrollableScreen extends CoreScreenLayer { @Override public void initialise() { - UIDropdownScrollable dropdown = find("Dropdown", UIDropdownScrollable.class); + UIDropdownScrollable dropdown = find("Dropdown", UIDropdownScrollable.class); + List options = new ArrayList<>(); - for (int i = 1; i <= 10; i++) + for (int i = 1; i <= 10; i++) { options.add("Option " + i); + } dropdown.setOptions(options); } } diff --git a/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java b/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java index 9d5c40e..a62efaa 100644 --- a/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java +++ b/src/main/java/org/terasology/tutorialnui/widgets/UITabBoxScreen.java @@ -6,7 +6,5 @@ public class UITabBoxScreen extends CoreScreenLayer { @Override - public void initialise(){ - - } + public void initialise() { } }