#332 Create tips package

prmr · Oct 22, 2020 · 2e498a0 · 2e498a0
1 parent 61962c3
commit 2e498a0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/src/ca/mcgill/cs/jetuml/gui/Media.java → src/ca/mcgill/cs/jetuml/gui/tips/Media.java b/src/ca/mcgill/cs/jetuml/gui/Media.java → src/ca/mcgill/cs/jetuml/gui/tips/Media.java
@@ -1,4 +1,4 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import java.util.Optional;
 

diff --git a/src/ca/mcgill/cs/jetuml/gui/TipElement.java → ...mcgill/cs/jetuml/gui/tips/TipElement.java b/src/ca/mcgill/cs/jetuml/gui/TipElement.java → ...mcgill/cs/jetuml/gui/tips/TipElement.java
@@ -1,4 +1,4 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 /**
  * Tip element represented as a Media/content pair.

diff --git a/src/ca/mcgill/cs/jetuml/gui/TipLoader.java → .../mcgill/cs/jetuml/gui/tips/TipLoader.java b/src/ca/mcgill/cs/jetuml/gui/TipLoader.java → .../mcgill/cs/jetuml/gui/tips/TipLoader.java
@@ -1,4 +1,4 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import static ca.mcgill.cs.jetuml.application.ApplicationResources.RESOURCES;
 
@@ -58,7 +58,7 @@ public String getTitle()
 		 */
 		public List<TipElement> getElements()
 		{
-			return new ArrayList<TipElement>(aElements);
+			return new ArrayList<>(aElements);
 		}
 
 		/**

diff --git a/test/ca/mcgill/cs/jetuml/gui/TestMedia.java → .../mcgill/cs/jetuml/gui/tips/TestMedia.java b/test/ca/mcgill/cs/jetuml/gui/TestMedia.java → .../mcgill/cs/jetuml/gui/tips/TestMedia.java
@@ -1,12 +1,11 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Test;
-
 import java.util.Optional;
-import ca.mcgill.cs.jetuml.gui.Media;
+
+import org.junit.jupiter.api.Test;
 
 public class TestMedia 
 {

diff --git a/...a/mcgill/cs/jetuml/gui/TestTipLoader.java → ...ill/cs/jetuml/gui/tips/TestTipLoader.java b/...a/mcgill/cs/jetuml/gui/TestTipLoader.java → ...ill/cs/jetuml/gui/tips/TestTipLoader.java
@@ -1,16 +1,15 @@
-package ca.mcgill.cs.jetuml.gui;
+package ca.mcgill.cs.jetuml.gui.tips;
 
 import static ca.mcgill.cs.jetuml.application.ApplicationResources.RESOURCES;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
+import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.json.JSONObject;
 
 public class TestTipLoader 
 {