Remove municipio from queries

Remove municipio from queries because it do not exist anymore
and it was causing the queries to return only old style instances.

src/main/java/br/ufpr/c3sl/estacaojuventude/Localizacao.java

@@ -69,19 +69,19 @@ public class Localizacao {
     private Date ultimaAlteracao;
 
     public static List<Localizacao> findAllLocalizacoesCandidatos() {
-        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p, Municipio m WHERE l.status = 'Candidato' AND l.ocorrencia = o.id AND o.programa_vinculado = p.id AND o.municipio = m.id ORDER BY p.nome_oficial, m.nome", Localizacao.class).getResultList();
+        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p WHERE l.status = 'Candidato' AND l.ocorrencia = o.id AND o.programa_vinculado = p.id ORDER BY p.nome_oficial", Localizacao.class).getResultList();
     }
 
     public static List<Localizacao> findAllLocalizacoesEfetivos() {
-        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p, Municipio m WHERE l.status = 'Efetivo' AND l.ocorrencia = o.id AND o.programa_vinculado = p.id AND o.municipio = m.id ORDER BY p.nome_oficial, m.nome", Localizacao.class).getResultList();
+        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p WHERE l.status = 'Efetivo' AND l.ocorrencia = o.id AND o.programa_vinculado = p.id ORDER BY p.nome_oficial", Localizacao.class).getResultList();
     }
 
     public static List<Localizacao> findAllLocalizacoesRejeitados() {
-        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p, Municipio m WHERE l.status = 'Rejeitado' AND l.ocorrencia = o.id AND o.programa_vinculado = p.id AND o.municipio = m.id ORDER BY p.nome_oficial, m.nome", Localizacao.class).getResultList();
+        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p WHERE l.status = 'Rejeitado' AND l.ocorrencia = o.id AND o.programa_vinculado = p.id ORDER BY p.nome_oficial", Localizacao.class).getResultList();
     }
 
     public static List<Localizacao> findMinhasLocalizacoes() {
         String login = SecurityContextHolder.getContext().getAuthentication().getName();
-        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p, Municipio m, Usuario u WHERE l.ocorrencia = o.id AND o.programa_vinculado = p.id AND o.municipio = m.id AND l.usuario = u.id AND l.status = 'Candidato' and u.login = '" + login + "' ORDER BY p.nome_oficial, m.nome", Localizacao.class).getResultList();
+        return entityManager().createNativeQuery("SELECT * FROM Localizacao l, Ocorrencia_Municipal o, Programa p, Usuario u WHERE l.ocorrencia = o.id AND o.programa_vinculado = p.id AND l.usuario = u.id AND l.status = 'Candidato' and u.login = '" + login + "' ORDER BY p.nome_oficial", Localizacao.class).getResultList();
     }
 }