From fd61356b413709f727fc5d09b9a03631b5c9c4f6 Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Sat, 27 Mar 2021 22:03:32 -0700 Subject: [PATCH] chore: remove usage of RegisterCopyStrategy --- .../reflection/copy/RegisterCopyStrategy.java | 28 ------------------- ...tegy.java => QuaternionfCopyStrategy.java} | 4 +-- .../copy/strategy/Vector2fCopyStrategy.java | 2 -- .../copy/strategy/Vector2iCopyStrategy.java | 2 -- .../copy/strategy/Vector3fCopyStrategy.java | 2 -- .../copy/strategy/Vector3iCopyStrategy.java | 2 -- .../copy/strategy/Vector4fCopyStrategy.java | 2 -- .../copy/strategy/Vector4iCopyStrategy.java | 17 +++++++++++ 8 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 nui-reflect/src/main/java/org/terasology/reflection/copy/RegisterCopyStrategy.java rename nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/{Quat4fCopyStrategy.java => QuaternionfCopyStrategy.java} (85%) create mode 100644 nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4iCopyStrategy.java diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/RegisterCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/RegisterCopyStrategy.java deleted file mode 100644 index 03eb1e3296..0000000000 --- a/nui-reflect/src/main/java/org/terasology/reflection/copy/RegisterCopyStrategy.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2014 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. - */ -package org.terasology.reflection.copy; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface RegisterCopyStrategy { -} diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Quat4fCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/QuaternionfCopyStrategy.java similarity index 85% rename from nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Quat4fCopyStrategy.java rename to nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/QuaternionfCopyStrategy.java index 79b45733e1..fad82ef9e0 100644 --- a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Quat4fCopyStrategy.java +++ b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/QuaternionfCopyStrategy.java @@ -17,12 +17,10 @@ import org.joml.Quaternionf; import org.terasology.reflection.copy.CopyStrategy; -import org.terasology.reflection.copy.RegisterCopyStrategy; /** */ -@RegisterCopyStrategy -public class Quat4fCopyStrategy implements CopyStrategy { +public class QuaternionfCopyStrategy implements CopyStrategy { @Override public Quaternionf copy(Quaternionf value) { diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2fCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2fCopyStrategy.java index 10091971fa..17c005ee14 100644 --- a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2fCopyStrategy.java +++ b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2fCopyStrategy.java @@ -17,11 +17,9 @@ import org.joml.Vector2f; import org.terasology.reflection.copy.CopyStrategy; -import org.terasology.reflection.copy.RegisterCopyStrategy; /** */ -@RegisterCopyStrategy public class Vector2fCopyStrategy implements CopyStrategy { @Override diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2iCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2iCopyStrategy.java index 54dac92e82..7480fd9f18 100644 --- a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2iCopyStrategy.java +++ b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector2iCopyStrategy.java @@ -17,11 +17,9 @@ import org.terasology.reflection.copy.CopyStrategy; import org.joml.Vector2i; -import org.terasology.reflection.copy.RegisterCopyStrategy; /** */ -@RegisterCopyStrategy public class Vector2iCopyStrategy implements CopyStrategy { @Override public Vector2i copy(Vector2i value) { diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3fCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3fCopyStrategy.java index 93980d81ff..b42995ab46 100644 --- a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3fCopyStrategy.java +++ b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3fCopyStrategy.java @@ -17,11 +17,9 @@ import org.joml.Vector3f; import org.terasology.reflection.copy.CopyStrategy; -import org.terasology.reflection.copy.RegisterCopyStrategy; /** */ -@RegisterCopyStrategy public class Vector3fCopyStrategy implements CopyStrategy { @Override diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3iCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3iCopyStrategy.java index 1c45729330..b1112f24ef 100644 --- a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3iCopyStrategy.java +++ b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector3iCopyStrategy.java @@ -17,11 +17,9 @@ import org.joml.Vector3i; import org.terasology.reflection.copy.CopyStrategy; -import org.terasology.reflection.copy.RegisterCopyStrategy; /** */ -@RegisterCopyStrategy public class Vector3iCopyStrategy implements CopyStrategy { @Override diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4fCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4fCopyStrategy.java index c489d0374b..03bb0bee80 100644 --- a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4fCopyStrategy.java +++ b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4fCopyStrategy.java @@ -17,11 +17,9 @@ import org.joml.Vector4f; import org.terasology.reflection.copy.CopyStrategy; -import org.terasology.reflection.copy.RegisterCopyStrategy; /** */ -@RegisterCopyStrategy public class Vector4fCopyStrategy implements CopyStrategy { @Override diff --git a/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4iCopyStrategy.java b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4iCopyStrategy.java new file mode 100644 index 0000000000..b0aca43981 --- /dev/null +++ b/nui-reflect/src/main/java/org/terasology/reflection/copy/strategy/Vector4iCopyStrategy.java @@ -0,0 +1,17 @@ +// Copyright 2021 The Terasology Foundation +// SPDX-License-Identifier: Apache-2.0 + +package org.terasology.reflection.copy.strategy; + +import org.joml.Vector4i; +import org.terasology.reflection.copy.CopyStrategy; + +public class Vector4iCopyStrategy implements CopyStrategy { + @Override + public Vector4i copy(Vector4i value) { + if (value != null) { + return new Vector4i(value); + } + return null; + } +}