Fix of Category creation from Word dialog

berk76 · Apr 14, 2019 · 411fc8d · 411fc8d
1 parent fa67826
commit 411fc8d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/cz/webstones/words/Dictionary.java b/src/main/java/cz/webstones/words/Dictionary.java
@@ -480,8 +480,6 @@ public void addCategory(String category) throws DictionaryException {
 
         subjectState = DictionaryStateEnum.stateCategoryListChanged;
         notifyAllObservers();
-
-        setCategory(category);
     }
 
     public void deleteCurrentCategory() throws DictionaryException {

diff --git a/src/main/java/cz/webstones/words/Main.java b/src/main/java/cz/webstones/words/Main.java
@@ -209,6 +209,7 @@ public void run() {
     private void addCategory(String category) {
         try {
             dict.addCategory(category);
+            dict.setCategory(category);
         } catch (DictionaryException ex) {
             JOptionPane.showMessageDialog(this, ex.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
         }

diff --git a/src/main/java/cz/webstones/words/mp3/Mp3Creator.java b/src/main/java/cz/webstones/words/mp3/Mp3Creator.java
@@ -15,7 +15,7 @@
 public class Mp3Creator {
 
     /* https://soundoftext.com/docs */
-    private static String endpoint = " https://api.soundoftext.com";
+    private static String endpoint = "https://api.soundoftext.com";
     private static boolean trustedInstalled = false;
 
 

diff --git a/src/test/java/cz/webstones/words/DictionaryTest.java b/src/test/java/cz/webstones/words/DictionaryTest.java
@@ -32,9 +32,9 @@ public void testWords() throws IOException, DictionaryException {
         d.addCategory("TestCat3");
 
         assertEquals("Observer getNoChange:", 0, o.getNoChange());
-        assertEquals("Observer getCurWordChanged:", 3, o.getCurWordChanged());
+        assertEquals("Observer getCurWordChanged:", 0, o.getCurWordChanged());
         assertEquals("Observer getCurWordDeleted:", 0, o.getCurWordDeleted());
-        assertEquals("Observer getCurCategoryChanged:", 3, o.getCurCategoryChanged());
+        assertEquals("Observer getCurCategoryChanged:", 0, o.getCurCategoryChanged());
         assertEquals("Observer getCategoryListChanged:", 3, o.getCategoryListChanged());
         assertEquals("Observer getWordAdded:", 0, o.getWordAdded());
         assertEquals("Observer getUnknown:", 0, o.getUnknown());
@@ -57,10 +57,10 @@ public void testWords() throws IOException, DictionaryException {
         assertEquals("Observer getWordAdded:", 3, o.getWordAdded());
         assertEquals("Observer getUnknown:", 0, o.getUnknown());
 
-        assertEquals("Fil dictionary size:", 0, d.size());
+        assertEquals("Fil dictionary size:", 3, d.size());
         assertEquals("All dictionary size:", 3, d.sizeOfAll());
         assertEquals("Category list size:", 3, d.getCategoryList().size());
-        assertEquals("Curr cat:", "TestCat3", d.getCurrentCategory());
+        assertEquals("Curr cat:",Dictionary.allCategoryName , d.getCurrentCategory());
 
         /* Filter category */
         o.reset();
@@ -149,9 +149,9 @@ public void testCategories() throws DictionaryException {
         d.addCategory("TestCat3");
 
         assertEquals("Observer getNoChange:", 0, o.getNoChange());
-        assertEquals("Observer getCurWordChanged:", 3, o.getCurWordChanged());
+        assertEquals("Observer getCurWordChanged:", 0, o.getCurWordChanged());
         assertEquals("Observer getCurWordDeleted:", 0, o.getCurWordDeleted());
-        assertEquals("Observer getCurCategoryChanged:", 3, o.getCurCategoryChanged());
+        assertEquals("Observer getCurCategoryChanged:", 0, o.getCurCategoryChanged());
         assertEquals("Observer getCategoryListChanged:", 3, o.getCategoryListChanged());
         assertEquals("Observer getWordAdded:", 0, o.getWordAdded());
         assertEquals("Observer getUnknown:", 0, o.getUnknown());