From d084cadd16307afd95ca2c6801cec6da99044deb Mon Sep 17 00:00:00 2001
From: gemcfadyen <gemcfadyen@hotmail.co.uk>
Date: Sat, 26 Dec 2015 14:43:26 +0000
Subject: [PATCH] sets up jdk

---
 .idea/.name        |  1 -
 .idea/compiler.xml | 23 -----------------------
 .idea/misc.xml     | 10 ----------
 .idea/modules.xml  |  9 ---------
 .idea/vcs.xml      |  8 --------
 Java/.gitignore    | 20 ++++++++++++++++++++
 Java/.idea/.name   |  1 +
 7 files changed, 21 insertions(+), 51 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 create mode 100644 Java/.idea/.name

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index c764764b..00000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-GuildedRose
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 217af471..00000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 6e367118..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
-
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 4278bcdd..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Java/Java.iml" filepath="$PROJECT_DIR$/Java/Java.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 9d32e507..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-
diff --git a/Java/.gitignore b/Java/.gitignore
index 2d7e4dc5..031f1a1a 100644
--- a/Java/.gitignore
+++ b/Java/.gitignore
@@ -1 +1,21 @@
 *.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+.idea/*
+*.iml
+
+out/*
+
+
+.gradle
+build/*
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
\ No newline at end of file
diff --git a/Java/.idea/.name b/Java/.idea/.name
new file mode 100644
index 00000000..8d0e3879
--- /dev/null
+++ b/Java/.idea/.name
@@ -0,0 +1 @@
+GildedRose.java
\ No newline at end of file