Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

as janelas do package view tem muitos acoplamentos #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

as janelas do package view tem muitos acoplamentos #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/sireata.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions nbactions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<actions>
<action>
<actionName>debug</actionName>
<packagings>
<packaging>war</packaging>
<packaging>ear</packaging>
<packaging>ejb</packaging>
</packagings>
<goals>
<goal>package</goal>
</goals>
<properties>
<netbeans.deploy.debugmode>true</netbeans.deploy.debugmode>
</properties>
</action>
</actions>
8 changes: 4 additions & 4 deletions src/main/java/br/edu/utfpr/dv/sireata/component/MenuBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import br.edu.utfpr.dv.sireata.view.LoginView;
import br.edu.utfpr.dv.sireata.view.OrgaoView;
import br.edu.utfpr.dv.sireata.view.UsuarioView;
import br.edu.utfpr.dv.sireata.window.EditarAtaWindow;
import br.edu.utfpr.dv.sireata.window.EditarSenhaWindow;
import br.edu.utfpr.dv.sireata.window.EditarUsuarioWindow;
import br.edu.utfpr.dv.sireata.window.SobreWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarAtaWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarSenhaWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarUsuarioWindow;
import br.edu.utfpr.dv.sireata.view.editar.SobreWindow;

public class MenuBar extends CustomComponent {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/br/edu/utfpr/dv/sireata/component/SideMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import br.edu.utfpr.dv.sireata.view.LoginView;
import br.edu.utfpr.dv.sireata.view.OrgaoView;
import br.edu.utfpr.dv.sireata.view.UsuarioView;
import br.edu.utfpr.dv.sireata.window.EditarAtaWindow;
import br.edu.utfpr.dv.sireata.window.EditarSenhaWindow;
import br.edu.utfpr.dv.sireata.window.EditarUsuarioWindow;
import br.edu.utfpr.dv.sireata.window.SobreWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarAtaWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarSenhaWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarUsuarioWindow;
import br.edu.utfpr.dv.sireata.view.editar.SobreWindow;

public class SideMenu extends CustomComponent {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/br/edu/utfpr/dv/sireata/util/DateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ public static Calendar getNow(){
return now;
}

public static int getSemester(){
/*public static int getSemester(){
Calendar today = DateUtils.getToday();

if(today.get(Calendar.MONTH) >= 6){
return 2;
}else{
return 1;
}
}
} */

public static int getSemester(Date date){
Calendar cal = Calendar.getInstance();
Expand All @@ -44,12 +44,12 @@ public static int getSemester(Date date){
return 1;
}
}

/*
public static int getYear(){
Calendar today = DateUtils.getToday();

return today.get(Calendar.YEAR);
}
}*/

public static int getDayOfMonth(Date date){
Calendar cal = Calendar.getInstance();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/br/edu/utfpr/dv/sireata/view/AtaView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import br.edu.utfpr.dv.sireata.component.ComboOrgao;
import br.edu.utfpr.dv.sireata.model.Ata;
import br.edu.utfpr.dv.sireata.util.DateUtils;
import br.edu.utfpr.dv.sireata.window.EditarAtaWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarAtaWindow;

public class AtaView extends ListView {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/br/edu/utfpr/dv/sireata/view/CampusView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import br.edu.utfpr.dv.sireata.bo.CampusBO;
import br.edu.utfpr.dv.sireata.model.Campus;
import br.edu.utfpr.dv.sireata.window.EditarCampusWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarCampusWindow;

public class CampusView extends ListView {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/br/edu/utfpr/dv/sireata/view/DepartamentoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import br.edu.utfpr.dv.sireata.component.ComboCampus;
import br.edu.utfpr.dv.sireata.component.ComboCampus.TipoFiltro;
import br.edu.utfpr.dv.sireata.model.Departamento;
import br.edu.utfpr.dv.sireata.window.EditarDepartamentoWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarDepartamentoWindow;

public class DepartamentoView extends ListView {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/br/edu/utfpr/dv/sireata/view/OrgaoView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import br.edu.utfpr.dv.sireata.component.ComboCampus.TipoFiltro;
import br.edu.utfpr.dv.sireata.component.ComboDepartamento;
import br.edu.utfpr.dv.sireata.model.Orgao;
import br.edu.utfpr.dv.sireata.window.EditarOrgaoWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarOrgaoWindow;

public class OrgaoView extends ListView {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/br/edu/utfpr/dv/sireata/view/UsuarioView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import br.edu.utfpr.dv.sireata.bo.UsuarioBO;
import br.edu.utfpr.dv.sireata.model.Usuario;
import br.edu.utfpr.dv.sireata.window.EditarUsuarioWindow;
import br.edu.utfpr.dv.sireata.view.editar.EditarUsuarioWindow;

public class UsuarioView extends ListView {

Expand Down
2 changes: 1 addition & 1 deletion .../dv/sireata/window/EditarAnexoWindow.java → ...ireata/view/editar/EditarAnexoWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.io.File;
import java.io.FileInputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...pr/dv/sireata/window/EditarAtaWindow.java → .../sireata/view/editar/EditarAtaWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...dv/sireata/window/EditarCampusWindow.java → ...reata/view/editar/EditarCampusWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.io.ByteArrayInputStream;
import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion ...ireata/window/EditarComentarioWindow.java → ...a/view/editar/EditarComentarioWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...eata/window/EditarDepartamentoWindow.java → ...view/editar/EditarDepartamentoWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.io.ByteArrayInputStream;
import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion ...dv/sireata/window/EditarMembroWindow.java → ...reata/view/editar/EditarMembroWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion .../dv/sireata/window/EditarOrgaoWindow.java → ...ireata/view/editar/EditarOrgaoWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...eata/window/EditarParticipanteWindow.java → ...view/editar/EditarParticipanteWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion .../dv/sireata/window/EditarPautaWindow.java → ...ireata/view/editar/EditarPautaWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion .../dv/sireata/window/EditarSenhaWindow.java → ...ireata/view/editar/EditarSenhaWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...v/sireata/window/EditarUsuarioWindow.java → ...eata/view/editar/EditarUsuarioWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion ...utfpr/dv/sireata/window/EditarWindow.java → .../dv/sireata/view/editar/EditarWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.UUID;

Expand Down
2 changes: 1 addition & 1 deletion ...reata/window/ListarComentariosWindow.java → .../view/editar/ListarComentariosWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import java.util.List;
import java.util.logging.Level;
Expand Down
2 changes: 1 addition & 1 deletion .../utfpr/dv/sireata/window/SobreWindow.java → ...r/dv/sireata/view/editar/SobreWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package br.edu.utfpr.dv.sireata.window;
package br.edu.utfpr.dv.sireata.view.editar;

import com.vaadin.server.ThemeResource;
import com.vaadin.ui.Alignment;
Expand Down