bug fix

When entering nothing, there would be no consideration of the emptines
Keheck · Aug 23, 2019 · df9a464 · df9a464
1 parent 41d9cf8
commit df9a464
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/io/github/keheck/Tasks.java b/src/io/github/keheck/Tasks.java
@@ -23,7 +23,25 @@ public static void onNewProject(String projName, String nameSpace, DialogNewProj
     {
         new Thread(() ->
         {
-            NavTree.cunstructTree(projName, nameSpace);
+            String myProjName = projName;
+            String myNamespace = nameSpace;
+
+            if(myProjName == null) myProjName = "";
+            if(myNamespace == null) myNamespace = "";
+
+            if(!myProjName.matches("[a-z0-9_]+"))
+            {
+                new DialogErrorNameInvalid(myProjName);
+                return;
+            }
+
+            if(!myNamespace.matches("[a-z0-9_]+"))
+            {
+                new DialogErrorNameInvalid(myNamespace);
+                return;
+            }
+
+            NavTree.cunstructTree(projName, myNamespace);
             if(project != null)
                 project.dispose();
         }, "Tree Constructor").start();

diff --git a/src/io/github/keheck/window/NavTree.java b/src/io/github/keheck/window/NavTree.java
@@ -20,6 +20,7 @@ public class NavTree
 
     public static void cunstructTree(String projName, String nameSpace)
     {
+        if("".equals(nameSpace) || nameSpace == null) nameSpace = projName;
         NavTreeFolder root = new NavTreeFolder(FOLDER, projName);
         JTree tree = Main.navTree;
         tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);