From d93b041397d2a48f67228f6522c86920799319a5 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 21 Jan 2014 06:11:18 +0000 Subject: [PATCH] moved 2 files to ensure history is saved --- .gitattributes | 5 +++-- .../src/main/java/forge/util/ReflectionUtil.java | 0 .../src/main/java/forge/util/Expressions.java | 0 forge-game/src/main/java/forge/util/package-info.java | 8 ++++++++ 4 files changed, 11 insertions(+), 2 deletions(-) rename {forge-gui => forge-core}/src/main/java/forge/util/ReflectionUtil.java (100%) rename {forge-gui => forge-game}/src/main/java/forge/util/Expressions.java (100%) create mode 100644 forge-game/src/main/java/forge/util/package-info.java diff --git a/.gitattributes b/.gitattributes index 31542bc92b4..67079c67806 100644 --- a/.gitattributes +++ b/.gitattributes @@ -95,6 +95,7 @@ forge-core/src/main/java/forge/util/ItemPoolSorter.java -text forge-core/src/main/java/forge/util/Lang.java -text forge-core/src/main/java/forge/util/MyRandom.java svneol=native#text/plain forge-core/src/main/java/forge/util/PredicateString.java -text +forge-core/src/main/java/forge/util/ReflectionUtil.java -text forge-core/src/main/java/forge/util/TextUtil.java -text forge-core/src/main/java/forge/util/ThreadUtil.java -text forge-core/src/main/java/forge/util/package-info.java -text @@ -117,6 +118,8 @@ forge-game/src/main/java/forge/game/GameFormat.java -text forge-game/src/main/java/forge/game/card/package-info.java -text forge-game/src/main/java/forge/game/package-info.java -text forge-game/src/main/java/forge/package-info.java -text +forge-game/src/main/java/forge/util/Expressions.java -text +forge-game/src/main/java/forge/util/package-info.java -text forge-gui/.classpath -text forge-gui/.project -text forge-gui/.settings/org.eclipse.core.resources.prefs -text @@ -15668,14 +15671,12 @@ forge-gui/src/main/java/forge/sound/SoundSystem.java -text forge-gui/src/main/java/forge/util/AwtUtil.java -text forge-gui/src/main/java/forge/util/Base64Coder.java svneol=native#text/plain forge-gui/src/main/java/forge/util/Evaluator.java -text -forge-gui/src/main/java/forge/util/Expressions.java -text forge-gui/src/main/java/forge/util/HttpUtil.java svneol=native#text/plain forge-gui/src/main/java/forge/util/IgnoringXStream.java -text forge-gui/src/main/java/forge/util/LineReader.java -text forge-gui/src/main/java/forge/util/MultiplexOutputStream.java svneol=native#text/plain forge-gui/src/main/java/forge/util/NameGenerator.java -text forge-gui/src/main/java/forge/util/OperatingSystem.java -text -forge-gui/src/main/java/forge/util/ReflectionUtil.java -text forge-gui/src/main/java/forge/util/XmlUtil.java -text forge-gui/src/main/java/forge/util/maps/EnumMapOfLists.java -text forge-gui/src/main/java/forge/util/maps/EnumMapToAmount.java -text diff --git a/forge-gui/src/main/java/forge/util/ReflectionUtil.java b/forge-core/src/main/java/forge/util/ReflectionUtil.java similarity index 100% rename from forge-gui/src/main/java/forge/util/ReflectionUtil.java rename to forge-core/src/main/java/forge/util/ReflectionUtil.java diff --git a/forge-gui/src/main/java/forge/util/Expressions.java b/forge-game/src/main/java/forge/util/Expressions.java similarity index 100% rename from forge-gui/src/main/java/forge/util/Expressions.java rename to forge-game/src/main/java/forge/util/Expressions.java diff --git a/forge-game/src/main/java/forge/util/package-info.java b/forge-game/src/main/java/forge/util/package-info.java new file mode 100644 index 00000000000..b9c9810076b --- /dev/null +++ b/forge-game/src/main/java/forge/util/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author Max + * + */ +package forge.util; \ No newline at end of file