Vers. 1.1

Author: HadiSDev

src/Model/Reader.java

@@ -132,25 +132,30 @@ public Address checkStreetName(Address a, ArrayList<String> streetList, Model m)
         return newAdd;
     }
 
-    public void findSuggestedAddresses(String inputText)
+    public void findSuggestedAddresses(String inputText) //TODO: this method is not workin corectly yet!!
     {
         final String regex = "(?<street>([0-9.]{1,3})?[a-zA-ZåæøÅÆØ. ]+)?\\s*(?<house>\\d{1,3}[A-Z]?)?\\s*[,]*\\s*(?<floor>(st|k(\\d{1,2})?|[1-9]{1,2}))?\\s*[,]*\\s*(?<side>(tv|th|mf|[1-9]{1,2}))?\\s*[,]*\\s*(?<postcode>\\d{4})?\\s*(?<city>[a-zA-ZåæøÅÆØ., ]+)?";
         Pattern pattern = Pattern.compile(regex);
         Matcher matcher = pattern.matcher(inputText);
         StringBuilder sb = new StringBuilder();
         int counter = 0;
 
-
-
         if(matcher.matches())
         {
             if(matcher.group("street")!=null)
             {
-
                 try(Stream<String> streetStream = Files.lines(Paths.get("src//externals//streetnames.txt")).filter(s-> s.toLowerCase().contains(matcher.group("street").toLowerCase()))) {
-                    sb.append(streetStream.filter(s-> s.contains(matcher.group("street"))));
-                    setChanged();
-                    notifyObservers(sb.toString());
+
+                    streetStream.forEach(street->{
+                        if(inputText.length()>3)
+                        {
+
+                            sb.append(street);
+                            setChanged();
+                            notifyObservers(sb.toString());
+                        }
+                    });
+
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -172,12 +177,12 @@ public void findSuggestedAddresses(String inputText)
                 }
                 if(matcher.group("postcode")!=null)
                 {
-                    checkPostCity(matcher.group("postcode"), sb, matcher);
+                    checkPostCity(matcher.group("postcode"), sb);
                     counter++;
                 }
                 if(matcher.group("city")!=null)
                 {
-                    checkPostCity(matcher.group("city"), sb, matcher);
+                    checkPostCity(matcher.group("city"), sb);
                     counter++;
 
                 }
@@ -189,16 +194,17 @@ public void findSuggestedAddresses(String inputText)
         }
 
     }
-    public void checkPostCity(String input, StringBuilder sb, Matcher matcher)
+    public void checkPostCity(String input, StringBuilder sb)
     {
         try (Stream<String> postCityStream = Files.lines(Paths.get("src//externals//postnumre.txt")).filter(s -> s.toLowerCase().contains(input.toLowerCase())))
         {
             postCityStream.forEach(e->{
                 sb.append(e.toString());
+                setChanged();
+                notifyObservers(sb.toString());
             });
 
-            setChanged();
-            notifyObservers(sb.toString());
+
         }
         catch (IOException e)
         {

src/View/View.java

@@ -55,7 +55,6 @@ public View(Model m, Reader r)
         centerpane.add(scrollPane);
         scrollPane.setPreferredSize(new Dimension(500,400));
 
-
         window.setLayout(new BorderLayout());
         window.add(northpanel, BorderLayout.NORTH);
         window.add(centerpane, BorderLayout.CENTER);
@@ -114,7 +113,7 @@ public void setSuggestions()
     @Override
     public void update(Observable o, Object arg)
     {
-        modelSuggestion.addElement((String) arg+"\n\n");
+        modelSuggestion.addElement((String) arg);
     }
 
 }