From 1c82daa77f51d6515347aa7e59b7ef13522f216e Mon Sep 17 00:00:00 2001 From: Dorgival Date: Sun, 1 Apr 2012 16:38:33 -0300 Subject: [PATCH 1/6] Atualizacao do Tocador de Apresentacao --- .../CampoInvalidoException.java | 16 + .../CampoObrigatorioException.java | 17 + .../DiretorioExistenteException.java | 18 + .../gerenciadorApresentacao/Tutorial.java | 77 +++++ .../gerenciadorApresentacao/TutorialXml.java | 65 ++++ .../XmlPersistencia.java | 93 +++++ src/iged/gui/TelaCadastroDeTarefaInterno.form | 4 +- src/iged/gui/TelaCadastroDeTarefaInterno.java | 3 + .../gui/TelaCadastroDeTutorialInterno.form | 4 +- .../gui/TelaCadastroDeTutorialInterno.java | 324 ++++++------------ .../TelaCadastroTarefaObjetivaInterno.form | 241 +++++++++++++ .../TelaCadastroTarefaObjetivaInterno.java | 316 +++++++++++++++++ src/iged/gui/TelaPrincipal.form | 46 ++- src/iged/gui/TelaPrincipal.java | 133 ++++++- src/iged/gui/TelaTarefaObjetivaInterno.form | 31 ++ src/iged/gui/TelaTarefaObjetivaInterno.java | 48 +++ src/iged/gui/TelaTocadorInterno.form | 29 +- src/iged/gui/TelaTocadorInterno.java | 115 ++++++- src/iged/gui/TelaTutorialFrameInterno.form | 5 +- src/iged/gui/TelaTutorialFrameInterno.java | 39 +-- .../gerenciador/TocadorDeSlideRodando.java | 166 ++++----- 21 files changed, 1402 insertions(+), 388 deletions(-) create mode 100644 src/iged/gerenciadorApresentacao/CampoInvalidoException.java create mode 100644 src/iged/gerenciadorApresentacao/CampoObrigatorioException.java create mode 100644 src/iged/gerenciadorApresentacao/DiretorioExistenteException.java create mode 100644 src/iged/gerenciadorApresentacao/Tutorial.java create mode 100644 src/iged/gerenciadorApresentacao/TutorialXml.java create mode 100644 src/iged/gerenciadorApresentacao/XmlPersistencia.java create mode 100644 src/iged/gui/TelaCadastroTarefaObjetivaInterno.form create mode 100644 src/iged/gui/TelaCadastroTarefaObjetivaInterno.java create mode 100644 src/iged/gui/TelaTarefaObjetivaInterno.form create mode 100644 src/iged/gui/TelaTarefaObjetivaInterno.java diff --git a/src/iged/gerenciadorApresentacao/CampoInvalidoException.java b/src/iged/gerenciadorApresentacao/CampoInvalidoException.java new file mode 100644 index 0000000..c0df072 --- /dev/null +++ b/src/iged/gerenciadorApresentacao/CampoInvalidoException.java @@ -0,0 +1,16 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package iged.gerenciadorApresentacao; + +/** + * + * @author Dorgi + */ +public class CampoInvalidoException extends Exception{ + + public CampoInvalidoException(String msg){ + super(msg); + } +} diff --git a/src/iged/gerenciadorApresentacao/CampoObrigatorioException.java b/src/iged/gerenciadorApresentacao/CampoObrigatorioException.java new file mode 100644 index 0000000..82e4fbd --- /dev/null +++ b/src/iged/gerenciadorApresentacao/CampoObrigatorioException.java @@ -0,0 +1,17 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package iged.gerenciadorApresentacao; + +/** + * + * @author Dorgi + */ +public class CampoObrigatorioException extends Exception { + + public CampoObrigatorioException(String msg){ + super(msg); + } +} diff --git a/src/iged/gerenciadorApresentacao/DiretorioExistenteException.java b/src/iged/gerenciadorApresentacao/DiretorioExistenteException.java new file mode 100644 index 0000000..d31fc0c --- /dev/null +++ b/src/iged/gerenciadorApresentacao/DiretorioExistenteException.java @@ -0,0 +1,18 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package iged.gerenciadorApresentacao; + +/** + * + * @author Dorgi + */ +public class DiretorioExistenteException extends Exception { + + public DiretorioExistenteException(String msg){ + super (msg); + } + +} diff --git a/src/iged/gerenciadorApresentacao/Tutorial.java b/src/iged/gerenciadorApresentacao/Tutorial.java new file mode 100644 index 0000000..cf81dcc --- /dev/null +++ b/src/iged/gerenciadorApresentacao/Tutorial.java @@ -0,0 +1,77 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package iged.gerenciadorApresentacao; + +import java.io.File; +import java.util.LinkedList; +import java.util.List; + +/** + * + * @author Dorgi + */ +public class Tutorial { + + private String titulo; + private String autor; + private String ano; + private String descricao; + private String area; + private LinkedList slides; + + public Tutorial() { + slides = new LinkedList(); + } + + public String getAno() { + return ano; + } + + public void setAno(String ano) { + this.ano = ano; + } + + public String getAutor() { + return autor; + } + + public void setAutor(String autor) { + this.autor = autor; + } + + public String getDescricao() { + return descricao; + } + + public void setDescricao(String descricao) { + this.descricao = descricao; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getTitulo() { + return titulo; + } + + public void setTitulo(String titulo) { + this.titulo = titulo; + } + + public LinkedList getSlides() { + return slides; + } + + public void setSlides(LinkedList slides) { + this.slides = slides; + } + + +} \ No newline at end of file diff --git a/src/iged/gerenciadorApresentacao/TutorialXml.java b/src/iged/gerenciadorApresentacao/TutorialXml.java new file mode 100644 index 0000000..c3f8664 --- /dev/null +++ b/src/iged/gerenciadorApresentacao/TutorialXml.java @@ -0,0 +1,65 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package iged.gerenciadorApresentacao; + +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; +import iged.gui.TelaCadastroDeTutorialInterno; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; + +/** + * + * @author Dorgi + */ +public class TutorialXml { + + //private static Tutorial tutorial; + private static XmlPersistencia p; + public static final File raiz = new File("./Tutoriais"); + + public static void criarXml(Tutorial tutorial) throws DiretorioExistenteException { + XStream xstream = new XStream(new DomDriver()); + + xstream.alias("tutorial", Tutorial.class); + + String xmlTutorial = xstream.toXML(tutorial); + System.out.println(xmlTutorial); + XmlPersistencia.salvarXml(xmlTutorial, "tutorial.xml"); + + } + + public static Tutorial lerXml() { + XStream x = new XStream(new DomDriver()); + //MetadadoTarefa metadado = new MetadadoAtividade(); + try { + // carrega o arquivo XML + FileInputStream input = new FileInputStream(new File(p.getNovoDir()+"/tutorial.xml")); + // informa o nome do nó raiz do xml + x.alias("tutorial", Tutorial.class); + // cria um objeto da classe, contendo os dados lidos no xml + Tutorial tut = (Tutorial) x.fromXML(input); + + System.out.println("Área: "+tut.getArea()); + System.out.println("Autor: "+tut.getAutor()); + System.out.println("Ano: "+tut.getAno()); + System.out.println("Título: "+tut.getTitulo()); + System.out.println("Descrição: "+tut.getDescricao()); + System.out.println("Slides: "+tut.getSlides()); + + return tut; + + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + +} diff --git a/src/iged/gerenciadorApresentacao/XmlPersistencia.java b/src/iged/gerenciadorApresentacao/XmlPersistencia.java new file mode 100644 index 0000000..5e9d88f --- /dev/null +++ b/src/iged/gerenciadorApresentacao/XmlPersistencia.java @@ -0,0 +1,93 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package iged.gerenciadorApresentacao; + +import iged.gui.TelaCadastroDeTarefaInterno; +import iged.gui.TelaCadastroDeTutorialInterno; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author Dorgi + */ +public class XmlPersistencia { + + public static final String DIRTAREFAS = "./Tutoriais/"; + private static File novoDir; + static File dir; + + public XmlPersistencia() { + } + + public static File criarDiretorio() throws DiretorioExistenteException { + TelaCadastroDeTutorialInterno tc = new TelaCadastroDeTutorialInterno(); + novoDir = new File(DIRTAREFAS + tc.getTituloStr()); + //if (novoDir.exists()) { + // throw new DiretorioExistenteException("Diretório já existe! Digite outro título!"); + // } else { + novoDir.mkdir(); + System.out.println("Diretório criado em: " + novoDir.getAbsolutePath()); + //} + return novoDir; + } + + public static File getNovoDir() throws DiretorioExistenteException{ + dir = criarDiretorio(); + return dir; + } + + static TutorialXml cxml = new TutorialXml(); + + public static void salvarXml(String tutorial, String nomeArquivo) throws DiretorioExistenteException { + BufferedWriter writer = null; + //Cria o arquivo já no sub-diretório + File arquivo = new File(getNovoDir(), "tutorial.xml"); + + try { + writer = new BufferedWriter(new FileWriter(arquivo)); + } catch (IOException ex) { + Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); + } + try { + writer.write(tutorial); + } catch (IOException ex) { + Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); + } + try { + writer.close(); + } catch (IOException ex) { + Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); + } + + } + /* + public static void salvarPortifolioXmlAtualizado() { + BufferedWriter writer = null; + //Cria o arquivo já no sub-diretório + File arquivo = new File(cxml.getDir(), DIRTAREFAS+"tarefas.xml"); + + try { + writer = new BufferedWriter(new FileWriter(arquivo)); + } catch (IOException ex) { + Logger.getLogger(TelaCadastroDeTarefaInterno.class.getName()).log(Level.SEVERE, null, ex); + } + try { + writer.write(cxml.atualizar()); //salva fisicamente + } catch (IOException ex) { + Logger.getLogger(TelaCadastroDeTarefaInterno.class.getName()).log(Level.SEVERE, null, ex); + } + try { + writer.close(); + } catch (IOException ex) { + Logger.getLogger(TelaCadastroDeTarefaInterno.class.getName()).log(Level.SEVERE, null, ex); + } + } + */ +} diff --git a/src/iged/gui/TelaCadastroDeTarefaInterno.form b/src/iged/gui/TelaCadastroDeTarefaInterno.form index ec40a7f..63c0fa4 100644 --- a/src/iged/gui/TelaCadastroDeTarefaInterno.form +++ b/src/iged/gui/TelaCadastroDeTarefaInterno.form @@ -114,7 +114,7 @@ - + @@ -413,7 +413,7 @@ - + diff --git a/src/iged/gui/TelaCadastroDeTarefaInterno.java b/src/iged/gui/TelaCadastroDeTarefaInterno.java index 996b53d..850b9ed 100644 --- a/src/iged/gui/TelaCadastroDeTarefaInterno.java +++ b/src/iged/gui/TelaCadastroDeTarefaInterno.java @@ -11,6 +11,9 @@ package iged.gui; import iged.Interpretador; +import iged.gerenciadorApresentacao.CampoInvalidoException; +import iged.gerenciadorApresentacao.CampoObrigatorioException; +import iged.gerenciadorApresentacao.DiretorioExistenteException; import iged.gerenciadorAtividade.GerenciadorAtividade; import iged.gerenciadorAtividade.MetadadoAtividade; import iged.gerenciadorAtividade.Portifolio; diff --git a/src/iged/gui/TelaCadastroDeTutorialInterno.form b/src/iged/gui/TelaCadastroDeTutorialInterno.form index b5983f7..d8cad15 100644 --- a/src/iged/gui/TelaCadastroDeTutorialInterno.form +++ b/src/iged/gui/TelaCadastroDeTutorialInterno.form @@ -110,7 +110,7 @@ - + @@ -153,7 +153,7 @@ - + diff --git a/src/iged/gui/TelaCadastroDeTutorialInterno.java b/src/iged/gui/TelaCadastroDeTutorialInterno.java index f4c0358..23229db 100644 --- a/src/iged/gui/TelaCadastroDeTutorialInterno.java +++ b/src/iged/gui/TelaCadastroDeTutorialInterno.java @@ -10,7 +10,12 @@ */ package iged.gui; -import java.awt.BorderLayout; +import iged.gerenciadorApresentacao.CampoInvalidoException; +import iged.gerenciadorApresentacao.CampoObrigatorioException; +import iged.gerenciadorApresentacao.DiretorioExistenteException; +import iged.gerenciadorApresentacao.Tutorial; +import iged.gerenciadorApresentacao.TutorialXml; +import iged.gerenciadorApresentacao.XmlPersistencia; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Image; @@ -43,9 +48,7 @@ public TelaCadastroDeTutorialInterno() { initComponents(); } - - -private void initComponents() { + private void initComponents() { proximo = new javax.swing.JButton(); panelTocador = new javax.swing.JPanel(); @@ -74,9 +77,10 @@ private void initComponents() { labelTocador = new javax.swing.JLabel(); setTitle("Cadastro de Apresentação"); - + proximo.setText("Proximo"); proximo.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { proximoActionPerformed(evt); } @@ -87,23 +91,22 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { javax.swing.GroupLayout panelTocadorLayout = new javax.swing.GroupLayout(panelTocador); panelTocador.setLayout(panelTocadorLayout); panelTocadorLayout.setHorizontalGroup( - panelTocadorLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 587, Short.MAX_VALUE) - ); + panelTocadorLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 587, Short.MAX_VALUE)); panelTocadorLayout.setVerticalGroup( - panelTocadorLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 520, Short.MAX_VALUE) - ); + panelTocadorLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 520, Short.MAX_VALUE)); anterior.setText("Anterior"); anterior.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { anteriorActionPerformed(evt); } }); botaoSelecionar.setText("Selecionar"); + botaoSelecionar.setEnabled(false); botaoSelecionar.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { try { botaoSelecionarActionPerformed(evt); @@ -116,19 +119,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { javax.swing.GroupLayout imagemPanelLayout = new javax.swing.GroupLayout(imagemPanel); imagemPanel.setLayout(imagemPanelLayout); imagemPanelLayout.setHorizontalGroup( - imagemPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(imagemPanelLayout.createSequentialGroup() - .addGap(33, 33, 33) - .addComponent(labelImagem) - .addContainerGap(71, Short.MAX_VALUE)) - ); + imagemPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(imagemPanelLayout.createSequentialGroup().addGap(33, 33, 33).addComponent(labelImagem).addContainerGap(71, Short.MAX_VALUE))); imagemPanelLayout.setVerticalGroup( - imagemPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(imagemPanelLayout.createSequentialGroup() - .addGap(28, 28, 28) - .addComponent(labelImagem) - .addContainerGap(81, Short.MAX_VALUE)) - ); + imagemPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(imagemPanelLayout.createSequentialGroup().addGap(28, 28, 28).addComponent(labelImagem).addContainerGap(81, Short.MAX_VALUE))); campoDescricao.setColumns(20); campoDescricao.setRows(5); @@ -138,6 +131,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { botaoCancelar.setText("Cancelar"); botaoCancelar.addActionListener(new java.awt.event.ActionListener() { + + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { botaoCancelarActionPerformed(evt); } @@ -145,6 +140,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { botaoOk.setText("OK"); botaoOk.addActionListener(new java.awt.event.ActionListener() { + + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { botaoOkActionPerformed(evt); } @@ -153,7 +150,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { autorLabel.setText("Autor:"); botaoCadastrar.setText("Cadastrar"); + botaoCadastrar.setEnabled(false); botaoCadastrar.addActionListener(new java.awt.event.ActionListener() { + + @Override public void actionPerformed(java.awt.event.ActionEvent evt) { botaoCadastrarActionPerformed(evt); } @@ -174,129 +174,13 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(31, 31, 31) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(imagemPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addGap(10, 10, 10) - .addComponent(botaoSelecionar))) - .addGap(139, 139, 139) - .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(areaLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(conteudoComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jSeparator4, javax.swing.GroupLayout.PREFERRED_SIZE, 396, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() - .addGap(15, 15, 15) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(layout.createSequentialGroup() - .addComponent(tituloLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(campoTitulo)) - .addGroup(layout.createSequentialGroup() - .addGap(84, 84, 84) - .addComponent(botaoCancelar) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(botaoOk, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(botaoCadastrar)) - .addGroup(layout.createSequentialGroup() - .addComponent(autorLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(campoAutor, javax.swing.GroupLayout.PREFERRED_SIZE, 232, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(anoLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(campoAno)) - .addGroup(layout.createSequentialGroup() - .addComponent(descricaoLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(7, 7, 7)))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(panelTocador, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(645, Short.MAX_VALUE) - .addComponent(anterior) - .addGap(35, 35, 35) - .addComponent(proximo) - .addGap(207, 207, 207))) - .addComponent(labelTocador, javax.swing.GroupLayout.DEFAULT_SIZE, 2, Short.MAX_VALUE) - .addContainerGap()) - ); + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addContainerGap().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addGap(31, 31, 31).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(imagemPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addGroup(layout.createSequentialGroup().addGap(10, 10, 10).addComponent(botaoSelecionar))).addGap(139, 139, 139).addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(areaLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(conteudoComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addComponent(jSeparator4, javax.swing.GroupLayout.PREFERRED_SIZE, 396, javax.swing.GroupLayout.PREFERRED_SIZE).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false).addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.LEADING).addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup().addGap(15, 15, 15).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false).addGroup(layout.createSequentialGroup().addComponent(tituloLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(campoTitulo)).addGroup(layout.createSequentialGroup().addGap(84, 84, 84).addComponent(botaoCancelar).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(botaoOk, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(botaoCadastrar)).addGroup(layout.createSequentialGroup().addComponent(autorLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(campoAutor, javax.swing.GroupLayout.PREFERRED_SIZE, 232, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(anoLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(campoAno)).addGroup(layout.createSequentialGroup().addComponent(descricaoLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE))).addGap(7, 7, 7)))).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED).addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(panelTocador, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)).addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup().addContainerGap(645, Short.MAX_VALUE).addComponent(anterior).addGap(35, 35, 35).addComponent(proximo).addGap(207, 207, 207))).addComponent(labelTocador, javax.swing.GroupLayout.DEFAULT_SIZE, 2, Short.MAX_VALUE).addContainerGap())); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(7, 7, 7) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(imagemPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(botaoSelecionar) - .addGap(25, 25, 25)) - .addGroup(layout.createSequentialGroup() - .addComponent(jSeparator2, javax.swing.GroupLayout.DEFAULT_SIZE, 162, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(areaLabel) - .addComponent(conteudoComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(tituloLabel) - .addComponent(campoTitulo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(autorLabel) - .addComponent(campoAutor, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(anoLabel) - .addComponent(campoAno, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(descricaoLabel) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(botaoCancelar) - .addComponent(botaoOk) - .addComponent(botaoCadastrar)) - .addGap(18, 18, 18) - .addComponent(jSeparator4, javax.swing.GroupLayout.PREFERRED_SIZE, 15, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(372, 372, 372)) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 377, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(labelTocador, javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(panelTocador, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(anterior) - .addComponent(proximo)))) - .addGap(29, 29, 29))) - .addContainerGap()) - ); + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup().addGap(7, 7, 7).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addComponent(imagemPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED).addComponent(botaoSelecionar).addGap(25, 25, 25)).addGroup(layout.createSequentialGroup().addComponent(jSeparator2, javax.swing.GroupLayout.DEFAULT_SIZE, 162, Short.MAX_VALUE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(areaLabel).addComponent(conteudoComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(tituloLabel).addComponent(campoTitulo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(autorLabel).addComponent(campoAutor, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(anoLabel).addComponent(campoAno, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(descricaoLabel).addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(botaoCancelar).addComponent(botaoOk).addComponent(botaoCadastrar)).addGap(18, 18, 18).addComponent(jSeparator4, javax.swing.GroupLayout.PREFERRED_SIZE, 15, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(372, 372, 372)).addGroup(layout.createSequentialGroup().addContainerGap().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 377, javax.swing.GroupLayout.PREFERRED_SIZE).addGroup(layout.createSequentialGroup().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(labelTocador, javax.swing.GroupLayout.DEFAULT_SIZE, 733, Short.MAX_VALUE).addGroup(layout.createSequentialGroup().addComponent(panelTocador, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(anterior).addComponent(proximo)))).addGap(29, 29, 29))).addContainerGap())); pack(); } - + /* // //GEN-BEGIN:initComponents private void initComponents() { @@ -544,27 +428,27 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { pack(); }// //GEN-END:initComponents -*/ + */ private void botaoCadastrarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoCadastrarActionPerformed - Object[] opcoes = {"Sim", "Não"}; - int opcao = JOptionPane.showOptionDialog(null, "Tem certeza que deseja cadastrar agora?", "Saída", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, opcoes, opcoes[0]); - do { - if (opcao == JOptionPane.YES_OPTION) { + Object[] opcoes = {"Sim", "Não"}; + int opcao = JOptionPane.showInternalOptionDialog(this, "Tem certeza que deseja cadastrar agora?", "Saída", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, opcoes, opcoes[0]); + do { + apagarCampos(); - } - } while (opcao != JOptionPane.YES_OPTION); - System.out.println("Saindo..."); + } while (opcao != JOptionPane.YES_OPTION); + System.out.println("Saindo..."); }//GEN-LAST:event_botaoCadastrarActionPerformed -/* + /* private void botaoSelecionarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoSelecionarActionPerformed }//GEN-LAST:event_botaoSelecionarActionPerformed -*/ - public void selecionadorDeArquivo() throws IOException { + */ + + public void selecionadorDeArquivo() throws IOException { JFileChooser jfc = new JFileChooser(); File arq; - File[] selecionados; + File[] selecionados = null; File swingFile = new File("C:\\Users\\Dorgi"); if (swingFile.exists()) { @@ -587,51 +471,46 @@ public String getDescription() { return "Arquivos de imagem (.jpg)"; } }); - //FileChooser com botão para salvar - //jfc.showSaveDialog(this); //Alterar o título da janela jfc.setDialogTitle("Abrir apresentacao"); - - //CamposXML c = new CamposXML(); - //Selecionar arquivo int retorno = jfc.showOpenDialog(null); if (retorno == JFileChooser.APPROVE_OPTION) { //pega o caminho de cada arquivo selecionado selecionados = jfc.getSelectedFiles(); + for (int i = 0; i < selecionados.length; i++) { - diretorioArqSel = selecionados[i].toString(); + diretorioArqSel = selecionados[i].getAbsolutePath(); + String nome = selecionados[i].getName(); BufferedImage imagem = ImageIO.read(new File(diretorioArqSel)); System.out.println(diretorioArqSel); - ImageIO.write(imagem, "JPG", new File("C:\\Tutoriais\\" + getTituloStr() + "\\Slide" + i + ".jpg")); + ImageIO.write(imagem, "JPG", new File("./Tutoriais/" + getTituloStr() + "\\" + nome)); + //ImageIO.write(imagem, "JPG", new File("./Tutoriais/" + getTituloStr() + "\\Slide" + i+".jpg")); + System.out.println(nome); + if (nome.equals("Slide1.JPG")) { + ImageIcon icone = new ImageIcon("./Tutoriais/" + getTituloStr() + "\\" + nome); + Image newimg = icone.getImage().getScaledInstance(100, 100, Image.SCALE_SMOOTH); + ImageIcon newIcon = new ImageIcon(newimg); + JLabel L1 = new JLabel(newIcon); + imagemPanel.add(L1); + imagemPanel.setLayout(new FlowLayout(FlowLayout.CENTER)); + setVisible(true); + imagemPanel.repaint(); + } } - //criar capa do cadastrador - imagemPanel.removeAll(); - String dirArquivo = jfc.getSelectedFile().getAbsolutePath(); - arq = jfc.getSelectedFile(); - img = new ImageIcon(dirArquivo); - Image newimg = img.getImage().getScaledInstance(100, 100, Image.SCALE_SMOOTH); - ImageIcon newIcon = new ImageIcon(newimg); - String nomeArquivo = jfc.getName(arq); - System.out.println(nomeArquivo); - imagemPanel.add(new JLabel(newIcon)); - imagemPanel.repaint(); - - //adiciona o panel no container - //panelCadastradorXML.add(this.imagemPanel, BorderLayout.CENTER); - //jFrame1.pack(); - imagemPanel.repaint(); + this.pack(); } else { System.out.println("Imagem não carregada!"); - }} - - ConversorXmlTutorial cXml = new ConversorXmlTutorial(); - + } + } + TutorialXml cXml = new TutorialXml(); + //ConversorXmlTutorial cXml = new ConversorXmlTutorial(); + private void botaoOkActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoOkActionPerformed - Object[] opcoes = {"Sim", "Não"}; + Object[] opcoes = {"Sim", "Não"}; int opcao = JOptionPane.showOptionDialog(null, "Tem certeza que os campos estão preenchidos corretamente?", "Saída", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, opcoes, opcoes[0]); do { if (opcao == JOptionPane.YES_OPTION) { @@ -645,16 +524,28 @@ private void botaoOkActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST } try { //validarArea(); - cXml.criarDiretorio(); - } catch (DiretorioExistenteException ex) { + XmlPersistencia.criarDiretorio(); + } catch (iged.gerenciadorApresentacao.DiretorioExistenteException ex) { Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); } - cXml.converterStringXML(); - cXml.salvarXmlTutorial(); - botaoSelecionar.setEnabled(true); - botaoOk.setEnabled(false); + Tutorial tut = new Tutorial(); + tut.setArea(getAreaStr()); + tut.setAno(getAnoStr()); + tut.setAutor(getAutorStr()); + tut.setDescricao(getDescricaoStr()); + tut.setTitulo(getTituloStr()); + try { + cXml.criarXml(tut); + botaoSelecionar.setEnabled(true); + botaoOk.setEnabled(false); + } catch (iged.gerenciadorApresentacao.DiretorioExistenteException ex) { + Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); + } + //XmlPersistencia.salvarXml(autorStr, anoStr); + + } catch (CampoObrigatorioException ex) { - JOptionPane.showMessageDialog(null, ex.getMessage()); + JOptionPane.showInternalMessageDialog(this, ex.getMessage()); } } } while (opcao != JOptionPane.YES_OPTION); @@ -662,12 +553,10 @@ private void botaoOkActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST }//GEN-LAST:event_botaoOkActionPerformed private void botaoCancelarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoCancelarActionPerformed - //OPÇÃO INSERIDA APENAS PARA TESTAR A FUNCIONALIDADE, DEPOIS REMOVER!! - l.lerXML(); // TODO add your handling code here: Object[] opcoes = {"Sim", "Não"}; //JOptionPane.showOptionDialog (Centro na janela, mensagem, titulo, opção, tipo de mensagem, nome do ícone, texto do botão com descrição a cima, label default dos botões); - int opcao = JOptionPane.showOptionDialog(null, "Tem certeza que deseja cancelar esta operação?", "Saída", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, opcoes, opcoes[0]); + int opcao = JOptionPane.showInternalOptionDialog(this, "Tem certeza que deseja cancelar esta operação?", "Saída", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, opcoes, opcoes[0]); //int opcao = JOptionPane.showConfirmDialog(null,"Tem certeza que deseja cancelar esta operação?"); if (opcao == JOptionPane.YES_OPTION) { @@ -805,66 +694,66 @@ public boolean validarCampos() throws CampoObrigatorioException, CampoInvalidoEx validado = true; } catch (CampoInvalidoException ex) { validado = false; - JOptionPane.showMessageDialog(null, ex.getMessage()); + JOptionPane.showInternalMessageDialog(this, ex.getMessage()); } return validado; } - protected static String getTituloStr() { + public static String getTituloStr() { return tituloStr; } - protected static String getAnoStr() { + public static String getAnoStr() { return anoStr; } - protected static String getAutorStr() { + public static String getAutorStr() { return autorStr; } - protected static String getDescricaoStr() { + public static String getDescricaoStr() { return descricaoStr; } - protected static String getAreaStr() { + public static String getAreaStr() { return areaStr; } public void sair() { System.exit(0); } - LeitorXML l = new LeitorXML(); - + //LeitorXML l = new LeitorXML(); + private void anteriorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_anteriorActionPerformed - desenhar(); + desenhar(); }//GEN-LAST:event_anteriorActionPerformed private void proximoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_proximoActionPerformed desenhar(); }//GEN-LAST:event_proximoActionPerformed - private void botaoSelecionarActionPerformed(java.awt.event.ActionEvent evt) throws iged.gui.CampoObrigatorioException { + private void botaoSelecionarActionPerformed(java.awt.event.ActionEvent evt) throws iged.gerenciadorApresentacao.CampoObrigatorioException { try { - //posição absoluta selecionadorDeArquivo(); Insets insets = getInsets(); Dimension size = botaoSelecionar.getPreferredSize(); botaoSelecionar.setBounds(25 + insets.left, 150 + insets.top, size.width, size.height); botaoCadastrar.setEnabled(true); + botaoSelecionar.setEnabled(false); } catch (IOException ex) { Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); } } - - protected static LinkedList itens = new LinkedList(); + protected static LinkedList itens = new LinkedList(); static String imagemArray; static LinkedList selecionado = new LinkedList(); - static File novoRaiz = new File("C:\\Tutoriais"); - - public void desenhar() { + static File novoRaiz = new File("./Tutoriais"); + TelaTutorialFrameInterno tt; + + public void desenhar() { String dirArquivo; - itens = TelaTutorialFrameInterno.lerDiretorio(novoRaiz); + itens = tt.lerDiretorio(novoRaiz); for (int i = 0; i < itens.size(); i++) { dirArquivo = itens.get(i).toString(); selecionado.add(dirArquivo); @@ -882,9 +771,9 @@ public void desenhar() { panelTocador.repaint(); } } - - public static void main(String args[]) { - + + public static void main(String args[]) { + try { try { UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); @@ -897,19 +786,18 @@ public static void main(String args[]) { Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); } catch (IllegalAccessException ex) { Logger.getLogger(TelaCadastroDeTutorialInterno.class.getName()).log(Level.SEVERE, null, ex); - + } - + java.awt.EventQueue.invokeLater(new Runnable() { public void run() { new TelaCadastroDeTutorialInterno().setVisible(true); - + } }); - } - + } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JLabel anoLabel; private javax.swing.JButton anterior; @@ -937,6 +825,6 @@ public void run() { private javax.swing.JButton proximo; private javax.swing.JLabel tituloLabel; // End of variables declaration//GEN-END:variables - private ImageIcon img; + private ImageIcon img; private String diretorioArqSel = null; } diff --git a/src/iged/gui/TelaCadastroTarefaObjetivaInterno.form b/src/iged/gui/TelaCadastroTarefaObjetivaInterno.form new file mode 100644 index 0000000..1a13e13 --- /dev/null +++ b/src/iged/gui/TelaCadastroTarefaObjetivaInterno.form @@ -0,0 +1,241 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/iged/gui/TelaCadastroTarefaObjetivaInterno.java b/src/iged/gui/TelaCadastroTarefaObjetivaInterno.java new file mode 100644 index 0000000..9d3e13c --- /dev/null +++ b/src/iged/gui/TelaCadastroTarefaObjetivaInterno.java @@ -0,0 +1,316 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +/* + * TelaCadastroTarefaObjetivaInterno.java + * + * Created on 27/03/2012, 00:39:22 + */ +package iged.gui; + +/** + * + * @author Dorgi + */ +public class TelaCadastroTarefaObjetivaInterno extends javax.swing.JInternalFrame { + + /** Creates new form TelaCadastroTarefaObjetivaInterno */ + public TelaCadastroTarefaObjetivaInterno() { + initComponents(); + } + + private void initComponents() { + + buttonGroup1 = new javax.swing.ButtonGroup(); + questaoLabel = new javax.swing.JLabel(); + cont = new javax.swing.JLabel(); + jScrollPane1 = new javax.swing.JScrollPane(); + jTextArea1 = new javax.swing.JTextArea(); + alternativaA = new javax.swing.JRadioButton(); + alternativaB = new javax.swing.JRadioButton(); + alternativaC = new javax.swing.JRadioButton(); + alternativaD = new javax.swing.JRadioButton(); + alternativaE = new javax.swing.JRadioButton(); + jTextFieldA = new javax.swing.JTextField(); + jTextFieldB = new javax.swing.JTextField(); + jTextFieldC = new javax.swing.JTextField(); + jTextFieldD = new javax.swing.JTextField(); + jTextFieldE = new javax.swing.JTextField(); + novaQuestao = new javax.swing.JButton(); + removeQuestao = new javax.swing.JButton(); + removerQuestao = new javax.swing.JCheckBox(); + cadastrar = new javax.swing.JButton(); + cancelar = new javax.swing.JButton(); + + questaoLabel.setText("Questão"); + + cont.setText(getCont()); + + jTextArea1.setColumns(20); + jTextArea1.setRows(5); + jScrollPane1.setViewportView(jTextArea1); + + alternativaA.setText("a"); + + alternativaB.setText("b"); + + alternativaC.setText("c"); + + alternativaD.setText("d"); + + alternativaE.setText("e"); + + jTextFieldA.setText(""); + + jTextFieldB.setText(""); + + jTextFieldC.setText(""); + + jTextFieldD.setText(""); + + jTextFieldE.setText(""); + + novaQuestao.setText("Adicionar Questão"); + + removeQuestao.setText("Remover Questão"); + + removerQuestao.setText("Remover"); + + cadastrar.setText("Cadastrar"); + + cancelar.setText("Cancelar"); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addContainerGap().addComponent(removerQuestao).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false).addGroup(layout.createSequentialGroup().addComponent(alternativaD).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jTextFieldD, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE)).addGroup(layout.createSequentialGroup().addComponent(alternativaC).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jTextFieldC, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE)).addGroup(layout.createSequentialGroup().addComponent(alternativaB).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jTextFieldB, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE)).addGroup(layout.createSequentialGroup().addComponent(alternativaA).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jTextFieldA)).addGroup(layout.createSequentialGroup().addComponent(questaoLabel).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(cont).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 522, javax.swing.GroupLayout.PREFERRED_SIZE)).addGroup(layout.createSequentialGroup().addComponent(alternativaE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jTextFieldE, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE))).addContainerGap(22, Short.MAX_VALUE)).addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup().addContainerGap(219, Short.MAX_VALUE).addComponent(novaQuestao).addGap(48, 48, 48).addComponent(removeQuestao).addGap(197, 197, 197)).addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup().addContainerGap(287, Short.MAX_VALUE).addComponent(cancelar).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(cadastrar).addGap(255, 255, 255))); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addGap(40, 40, 40).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(questaoLabel).addComponent(cont).addComponent(removerQuestao))).addGroup(layout.createSequentialGroup().addGap(24, 24, 24).addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE))).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(alternativaA).addComponent(jTextFieldA, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(alternativaB).addComponent(jTextFieldB, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(alternativaC).addComponent(jTextFieldC, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING).addComponent(alternativaD).addComponent(jTextFieldD, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING).addComponent(alternativaE).addComponent(jTextFieldE, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(18, 18, 18).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(removeQuestao).addComponent(novaQuestao)).addGap(18, 18, 18).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE).addComponent(cadastrar).addComponent(cancelar)).addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); + + pack(); + } + private int contador = 0; + + public String getCont() { + contador++; + String c = String.valueOf(contador); + return c; + } + + public void alternativaCorreta() { + if (alternativaA.isSelected()) { + + } + } + /* + // //GEN-BEGIN:initComponents + private void initComponents() { + + buttonGroup1 = new javax.swing.ButtonGroup(); + questaoLabel = new javax.swing.JLabel(); + cont = new javax.swing.JLabel(); + jScrollPane1 = new javax.swing.JScrollPane(); + jTextArea1 = new javax.swing.JTextArea(); + alternativaA = new javax.swing.JRadioButton(); + alternativaB = new javax.swing.JRadioButton(); + alternativaC = new javax.swing.JRadioButton(); + alternativaD = new javax.swing.JRadioButton(); + alternativaE = new javax.swing.JRadioButton(); + jTextFieldA = new javax.swing.JTextField(); + jTextFieldB = new javax.swing.JTextField(); + jTextFieldC = new javax.swing.JTextField(); + jTextFieldD = new javax.swing.JTextField(); + jTextFieldE = new javax.swing.JTextField(); + novaQuestao = new javax.swing.JButton(); + removeQuestao = new javax.swing.JButton(); + removerQuestao = new javax.swing.JCheckBox(); + cadastrar = new javax.swing.JButton(); + cancelar = new javax.swing.JButton(); + + questaoLabel.setText("Questão"); + + cont.setText("jLabel1"); + + jTextArea1.setColumns(20); + jTextArea1.setRows(5); + jScrollPane1.setViewportView(jTextArea1); + + alternativaA.setText("a"); + + alternativaB.setText("b"); + + alternativaC.setText("c"); + + alternativaD.setText("d"); + + alternativaE.setText("e"); + + jTextFieldB.setText("jTextField1"); + jTextFieldB.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jTextFieldBActionPerformed(evt); + } + }); + + jTextFieldC.setText("jTextField1"); + + jTextFieldD.setText("jTextField1"); + + jTextFieldE.setText("jTextField1"); + + novaQuestao.setText("Adicionar Questão"); + + removeQuestao.setText("Remover Questão"); + + removerQuestao.setText("Remover"); + + cadastrar.setText("Cadastrar"); + + cancelar.setText("Cancelar"); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(removerQuestao) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(layout.createSequentialGroup() + .addComponent(alternativaD) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jTextFieldD, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addComponent(alternativaC) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jTextFieldC, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addComponent(alternativaB) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jTextFieldB, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addComponent(alternativaA) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jTextFieldA)) + .addGroup(layout.createSequentialGroup() + .addComponent(questaoLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(cont) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 522, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addComponent(alternativaE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jTextFieldE, javax.swing.GroupLayout.DEFAULT_SIZE, 505, Short.MAX_VALUE))) + .addContainerGap(22, Short.MAX_VALUE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addContainerGap(219, Short.MAX_VALUE) + .addComponent(novaQuestao) + .addGap(48, 48, 48) + .addComponent(removeQuestao) + .addGap(197, 197, 197)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addContainerGap(287, Short.MAX_VALUE) + .addComponent(cancelar) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(cadastrar) + .addGap(255, 255, 255)) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(40, 40, 40) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(questaoLabel) + .addComponent(cont) + .addComponent(removerQuestao))) + .addGroup(layout.createSequentialGroup() + .addGap(24, 24, 24) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(alternativaA) + .addComponent(jTextFieldA, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(alternativaB) + .addComponent(jTextFieldB, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(alternativaC) + .addComponent(jTextFieldC, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(alternativaD) + .addComponent(jTextFieldD, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(alternativaE) + .addComponent(jTextFieldE, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(18, 18, 18) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(removeQuestao) + .addComponent(novaQuestao)) + .addGap(18, 18, 18) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(cadastrar) + .addComponent(cancelar)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + + pack(); + }// //GEN-END:initComponents + + private void jTextFieldBActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jTextFieldBActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_jTextFieldBActionPerformed + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JRadioButton alternativaA; + private javax.swing.JRadioButton alternativaB; + private javax.swing.JRadioButton alternativaC; + private javax.swing.JRadioButton alternativaD; + private javax.swing.JRadioButton alternativaE; + private javax.swing.ButtonGroup buttonGroup1; + private javax.swing.JButton cadastrar; + private javax.swing.JButton cancelar; + private javax.swing.JLabel cont; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JTextArea jTextArea1; + private javax.swing.JTextField jTextFieldA; + private javax.swing.JTextField jTextFieldB; + private javax.swing.JTextField jTextFieldC; + private javax.swing.JTextField jTextFieldD; + private javax.swing.JTextField jTextFieldE; + private javax.swing.JButton novaQuestao; + private javax.swing.JLabel questaoLabel; + private javax.swing.JButton removeQuestao; + private javax.swing.JCheckBox removerQuestao; + // End of variables declaration//GEN-END:variables + }*/ + private javax.swing.JRadioButton alternativaA; + private javax.swing.JRadioButton alternativaB; + private javax.swing.JRadioButton alternativaC; + private javax.swing.JRadioButton alternativaD; + private javax.swing.JRadioButton alternativaE; + private javax.swing.ButtonGroup buttonGroup1; + private javax.swing.JButton cadastrar; + private javax.swing.JButton cancelar; + private javax.swing.JLabel cont; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JTextArea jTextArea1; + private javax.swing.JTextField jTextFieldA; + private javax.swing.JTextField jTextFieldB; + private javax.swing.JTextField jTextFieldC; + private javax.swing.JTextField jTextFieldD; + private javax.swing.JTextField jTextFieldE; + private javax.swing.JButton novaQuestao; + private javax.swing.JLabel questaoLabel; + private javax.swing.JButton removeQuestao; + private javax.swing.JCheckBox removerQuestao; +} diff --git a/src/iged/gui/TelaPrincipal.form b/src/iged/gui/TelaPrincipal.form index 07df79d..3836c7c 100644 --- a/src/iged/gui/TelaPrincipal.form +++ b/src/iged/gui/TelaPrincipal.form @@ -31,12 +31,16 @@ - + - + + + + + @@ -52,11 +56,13 @@ - + - + + + @@ -109,7 +115,7 @@ - + @@ -117,7 +123,7 @@ - + @@ -153,5 +159,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/iged/gui/TelaPrincipal.java b/src/iged/gui/TelaPrincipal.java index b58eaac..a19ede9 100644 --- a/src/iged/gui/TelaPrincipal.java +++ b/src/iged/gui/TelaPrincipal.java @@ -65,10 +65,12 @@ private void initComponents() { jDesktopPane1 = new javax.swing.JDesktopPane(); botaoCadastrarTutorial = new javax.swing.JButton(); botaoAbrir = new javax.swing.JButton(); - botaoVisualizarTutorial = new javax.swing.JButton(); + botaoPesquisarTutorial = new javax.swing.JButton(); botaoCadastrarExercicio = new javax.swing.JButton(); botaoAjuda = new javax.swing.JButton(); botaoPesquisarExercicio = new javax.swing.JButton(); + botaoCadastrarObjetiva = new javax.swing.JButton(); + botaoExecutarObjetiva = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setTitle("IGED - Interpretador de Comandos e Avaliador Gráfico para o Ensino de Estrutura de Dados"); @@ -101,11 +103,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { } }); - botaoVisualizarTutorial.setIcon(new javax.swing.ImageIcon(getClass().getResource("/61.png"))); // NOI18N - botaoVisualizarTutorial.setToolTipText("Visualizar Tutorial"); - botaoVisualizarTutorial.addActionListener(new java.awt.event.ActionListener() { + botaoPesquisarTutorial.setIcon(new javax.swing.ImageIcon(getClass().getResource("/61.png"))); // NOI18N + botaoPesquisarTutorial.setToolTipText("Visualizar Tutorial"); + botaoPesquisarTutorial.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - botaoVisualizarTutorialActionPerformed(evt); + botaoPesquisarTutorialActionPerformed(evt); } }); @@ -133,6 +135,22 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { } }); + botaoCadastrarObjetiva.setIcon(new javax.swing.ImageIcon(getClass().getResource("/44.png"))); // NOI18N + botaoCadastrarObjetiva.setToolTipText("Cadastrar Tarefa Objetiva"); + botaoCadastrarObjetiva.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + botaoCadastrarObjetivaActionPerformed(evt); + } + }); + + botaoExecutarObjetiva.setIcon(new javax.swing.ImageIcon(getClass().getResource("/43.png"))); // NOI18N + botaoExecutarObjetiva.setToolTipText("Pesquisar Exercício Objetivo"); + botaoExecutarObjetiva.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + botaoExecutarObjetivaActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -144,12 +162,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGap(2, 2, 2) .addComponent(botaoCadastrarTutorial) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(botaoVisualizarTutorial) + .addComponent(botaoPesquisarTutorial) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(botaoCadastrarExercicio) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(botaoPesquisarExercicio) - .addGap(109, 109, 109) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(botaoCadastrarObjetiva) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(botaoExecutarObjetiva) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 31, Short.MAX_VALUE) .addComponent(botaoAjuda)) .addComponent(panelPrincipal, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap()) @@ -161,23 +183,29 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(botaoAbrir) .addComponent(botaoCadastrarTutorial) - .addComponent(botaoVisualizarTutorial) - .addComponent(botaoCadastrarExercicio) - .addComponent(botaoAjuda)) - .addComponent(botaoPesquisarExercicio)) + .addComponent(botaoPesquisarTutorial) + .addComponent(botaoCadastrarExercicio)) + .addComponent(botaoAjuda) + .addComponent(botaoCadastrarObjetiva) + .addComponent(botaoPesquisarExercicio) + .addComponent(botaoExecutarObjetiva)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(panelPrincipal, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()) ); + botaoCadastrarObjetiva.getAccessibleContext().setAccessibleDescription(""); + botaoExecutarObjetiva.getAccessibleContext().setAccessibleDescription(""); + pack(); }// //GEN-END:initComponents - static JInternalFrame cadTutorial, cadExe, visualizarTut, responderExe, pesquisarExe; + static JInternalFrame cadTutorial, cadExe, visualizarTut, responderExe, pesquisarExe, cadExeObj, responderExeObj, abrirTocador; - private void botaoVisualizarTutorialActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoVisualizarTutorialActionPerformed + private void botaoPesquisarTutorialActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoPesquisarTutorialActionPerformed if (visualizarTut == null) //instancia a tela de cadastro de clientes { - visualizarTut = new TelaTocadorInterno(); + visualizarTut = new TelaTutorialFrameInterno(); + //visualizarTut = new TelaTutorialFrameInterno(); jDesktopPane1.add(visualizarTut); ((BasicInternalFrameUI)visualizarTut.getUI()).setNorthPane(null); try { @@ -194,7 +222,7 @@ private void botaoVisualizarTutorialActionPerformed(java.awt.event.ActionEvent e } //independente da tela estar visível ou não, a tela é movida para frente //jDesktopPane1.moveToFront(visualizarTut); - }//GEN-LAST:event_botaoVisualizarTutorialActionPerformed + }//GEN-LAST:event_botaoPesquisarTutorialActionPerformed /**/ public static void botaoResponderExercicio() { if (responderExe == null) //instancia a tela de cadastro de clientes @@ -219,6 +247,27 @@ public static void botaoResponderExercicio() { //jDesktopPane1.remove(responderExe);} } + public static void botaoAbrirTocador() { + if (abrirTocador == null) //instancia a tela de cadastro de clientes + { + abrirTocador = new TelaTocadorInterno(); + jDesktopPane1.add(abrirTocador); + ((BasicInternalFrameUI)abrirTocador.getUI()).setNorthPane(null); + try { + abrirTocador.setMaximum(true); + } catch (PropertyVetoException ex) { + Logger.getLogger(TelaPrincipal.class.getName()).log(Level.SEVERE, null, ex); + } + abrirTocador.setClosable(true); + abrirTocador.setMaximizable(true); + abrirTocador.setIconifiable(true); + abrirTocador.show(); + } else{ + //TelaPrincipal.botaoResponderExercicio();.dispose(); + } + + } + private void botaoCadastrarExercicioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoCadastrarExercicioActionPerformed if (cadExe == null) //instancia a tela de cadastro de clientes { @@ -297,7 +346,7 @@ public String getDescription() { //Alterar o título da janela jfc.setDialogTitle("Abrir apresentacao"); - int retorno = jfc.showOpenDialog(null); + jfc.showOpenDialog(null); }//GEN-LAST:event_botaoAbrirActionPerformed @@ -327,6 +376,50 @@ private void botaoPesquisarExercicioActionPerformed(java.awt.event.ActionEvent e } }//GEN-LAST:event_botaoPesquisarExercicioActionPerformed + private void botaoCadastrarObjetivaActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoCadastrarObjetivaActionPerformed + if (cadExeObj == null) //instancia a tela de cadastro de clientes + { + cadExeObj = new TelaCadastroTarefaObjetivaInterno(); + jDesktopPane1.add(cadExeObj); + ((BasicInternalFrameUI)cadExeObj.getUI()).setNorthPane(null); + try { + cadExeObj.setMaximum(true); + } catch (PropertyVetoException ex) { + Logger.getLogger(TelaPrincipal.class.getName()).log(Level.SEVERE, null, ex); + } + + cadExeObj.setClosable(true); + cadExeObj.setMaximizable(true); + cadExeObj.setIconifiable(true); + cadExeObj.show(); + } + else{ + cadExeObj.dispose(); + } + }//GEN-LAST:event_botaoCadastrarObjetivaActionPerformed + + private void botaoExecutarObjetivaActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_botaoExecutarObjetivaActionPerformed + if (responderExeObj == null) //instancia a tela de cadastro de clientes + { + responderExeObj = new TelaTarefaObjetivaInterno(); + jDesktopPane1.add(responderExeObj); + ((BasicInternalFrameUI)responderExeObj.getUI()).setNorthPane(null); + try { + responderExeObj.setMaximum(true); + } catch (PropertyVetoException ex) { + Logger.getLogger(TelaPrincipal.class.getName()).log(Level.SEVERE, null, ex); + } + + responderExeObj.setClosable(true); + responderExeObj.setMaximizable(true); + responderExeObj.setIconifiable(true); + responderExeObj.show(); + } + else{ + responderExeObj.dispose(); + } + }//GEN-LAST:event_botaoExecutarObjetivaActionPerformed + /** * @param args the command line arguments */ @@ -369,9 +462,11 @@ public void run() { private javax.swing.JButton botaoAbrir; private javax.swing.JButton botaoAjuda; private javax.swing.JButton botaoCadastrarExercicio; + private javax.swing.JButton botaoCadastrarObjetiva; private javax.swing.JButton botaoCadastrarTutorial; + private javax.swing.JButton botaoExecutarObjetiva; private javax.swing.JButton botaoPesquisarExercicio; - private javax.swing.JButton botaoVisualizarTutorial; + private javax.swing.JButton botaoPesquisarTutorial; private javax.swing.JDesktopPane jDesktopPane1; private javax.swing.JPanel panelPrincipal; // End of variables declaration//GEN-END:variables @@ -382,7 +477,9 @@ public void run() { private javax.swing.JButton botaoCadastrarTutorial; private javax.swing.JButton botaoPesquisarExercicio; private javax.swing.JButton botaoResponderExercicio; - private javax.swing.JButton botaoVisualizarTutorial; + private javax.swing.JButton botaoPesquisarTutorial; private static javax.swing.JDesktopPane jDesktopPane1; private javax.swing.JPanel panelPrincipal; + private javax.swing.JButton botaoCadastrarObjetiva; + private javax.swing.JButton botaoExecutarObjetiva; } diff --git a/src/iged/gui/TelaTarefaObjetivaInterno.form b/src/iged/gui/TelaTarefaObjetivaInterno.form new file mode 100644 index 0000000..cc44c77 --- /dev/null +++ b/src/iged/gui/TelaTarefaObjetivaInterno.form @@ -0,0 +1,31 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/iged/gui/TelaTarefaObjetivaInterno.java b/src/iged/gui/TelaTarefaObjetivaInterno.java new file mode 100644 index 0000000..b02a104 --- /dev/null +++ b/src/iged/gui/TelaTarefaObjetivaInterno.java @@ -0,0 +1,48 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +/* + * TelaTarefaObjetivaInterno.java + * + * Created on 27/03/2012, 00:39:36 + */ +package iged.gui; + +/** + * + * @author Dorgi + */ +public class TelaTarefaObjetivaInterno extends javax.swing.JInternalFrame { + + /** Creates new form TelaTarefaObjetivaInterno */ + public TelaTarefaObjetivaInterno() { + initComponents(); + } + + /** This method is called from within the constructor to + * initialize the form. + * WARNING: Do NOT modify this code. The content of this method is + * always regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 394, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 274, Short.MAX_VALUE) + ); + + pack(); + }// //GEN-END:initComponents + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables +} diff --git a/src/iged/gui/TelaTocadorInterno.form b/src/iged/gui/TelaTocadorInterno.form index c0d7d51..24db50b 100644 --- a/src/iged/gui/TelaTocadorInterno.form +++ b/src/iged/gui/TelaTocadorInterno.form @@ -23,20 +23,17 @@ - - - - - - - - - - - - + + + + + + + + + @@ -49,7 +46,7 @@ - + @@ -59,11 +56,17 @@ + + + + + + diff --git a/src/iged/gui/TelaTocadorInterno.java b/src/iged/gui/TelaTocadorInterno.java index cf974bc..253931a 100644 --- a/src/iged/gui/TelaTocadorInterno.java +++ b/src/iged/gui/TelaTocadorInterno.java @@ -10,15 +10,32 @@ */ package iged.gui; +import java.awt.FlowLayout; +import java.awt.Image; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import javax.swing.JLabel; + /** * * @author Dorgi */ public class TelaTocadorInterno extends javax.swing.JInternalFrame { + int cont = 0; + static File novoRaiz; + static ArrayList itens = new ArrayList(); + private static final File raiz = new File("./Tutoriais"); /** Creates new form TocadorInterno */ public TelaTocadorInterno() { initComponents(); + lerDiretorio(raiz); } /** This method is called from within the constructor to @@ -37,8 +54,18 @@ private void initComponents() { setTitle("Exibidor de Apresentação"); ant.setText("Anterior"); + ant.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + antActionPerformed(evt); + } + }); prox.setText("Próximo"); + prox.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + proxActionPerformed(evt); + } + }); jPanel1.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); @@ -58,16 +85,15 @@ private void initComponents() { layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(352, 352, 352) - .addComponent(ant) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(prox)) - .addGroup(layout.createSequentialGroup() - .addGap(70, 70, 70) - .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addGap(70, 70, 70) + .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGap(74, 74, 74)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGap(368, 368, 368) + .addComponent(ant) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(prox) + .addContainerGap(345, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -78,12 +104,81 @@ private void initComponents() { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(ant) .addComponent(prox)) - .addContainerGap(15, Short.MAX_VALUE)) + .addContainerGap(31, Short.MAX_VALUE)) ); pack(); }// //GEN-END:initComponents + + private void antActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_antActionPerformed + try { + cont--; + desenharProx(); + } catch (IOException ex) { + Logger.getLogger(TelaTocadorInterno.class.getName()).log(Level.SEVERE, null, ex); + } + + }//GEN-LAST:event_antActionPerformed + + private void proxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_proxActionPerformed + try { + desenharProx(); + cont++; + } catch (IOException ex) { + Logger.getLogger(TelaTocadorInterno.class.getName()).log(Level.SEVERE, null, ex); + } + + }//GEN-LAST:event_proxActionPerformed + + public ArrayList getItens() { + return itens; + } + + public int getCont() { + return cont; + } + public void desenharProx() throws IOException { + File fileImg1; + BufferedImage img1 = null; + for (int k = getCont(); k < getItens().size(); k++) { + jPanel1.removeAll(); + jPanel1.revalidate(); + if (getItens().get(k).toString().contains("F:\\Documentos\\NetBeansProjects\\IGED\\.\\Tutoriais\\cont")) { + fileImg1 = new File(getItens().get(k).getAbsolutePath()); + img1 = ImageIO.read(fileImg1); + ImageIcon icone = new ImageIcon(img1); + Image newimg = icone.getImage().getScaledInstance(800, 600, Image.SCALE_SMOOTH); + ImageIcon newIcon = new ImageIcon(newimg); + JLabel label1 = new JLabel(newIcon); + jPanel1.add(label1); + jPanel1.setLayout(new FlowLayout(FlowLayout.CENTER)); + } + break; + } + } + + public static ArrayList lerDiretorio(File raiz) { + + String item = raiz.getName(); + System.out.println(item); + + for (File f : raiz.listFiles()) { + if (f.isDirectory()) { + novoRaiz = f.getAbsoluteFile(); + System.out.println("\t" + novoRaiz); + for (File f1 : novoRaiz.listFiles()) { + if (f1.isFile() && f1.getName().contains("Slide")) { + itens.add(f1); + System.out.println(f1.getName()); + } + } + + } + + } + return itens; + } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton ant; private javax.swing.JPanel jPanel1; diff --git a/src/iged/gui/TelaTutorialFrameInterno.form b/src/iged/gui/TelaTutorialFrameInterno.form index 5a55fd4..4e361d7 100644 --- a/src/iged/gui/TelaTutorialFrameInterno.form +++ b/src/iged/gui/TelaTutorialFrameInterno.form @@ -4,6 +4,9 @@ + + + @@ -39,7 +42,7 @@ - + diff --git a/src/iged/gui/TelaTutorialFrameInterno.java b/src/iged/gui/TelaTutorialFrameInterno.java index 28a21b3..8a63319 100644 --- a/src/iged/gui/TelaTutorialFrameInterno.java +++ b/src/iged/gui/TelaTutorialFrameInterno.java @@ -10,6 +10,8 @@ */ package iged.gui; + +import iged.gerenciadorApresentacao.TutorialXml; import java.awt.FlowLayout; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; @@ -39,6 +41,7 @@ public class TelaTutorialFrameInterno extends javax.swing.JInternalFrame { /** Creates new form TutorialFrameInterno */ public TelaTutorialFrameInterno() { initComponents(); + desenharMiniaturaTutorial(); } /** This method is called from within the constructor to @@ -181,9 +184,11 @@ public void mouseClicked(java.awt.event.MouseEvent evt) { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(imgPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(descPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(299, Short.MAX_VALUE)) + .addContainerGap(303, Short.MAX_VALUE)) ); + getAccessibleContext().setAccessibleDescription(""); + pack(); }// //GEN-END:initComponents @@ -191,10 +196,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) { public void abrirTocador() { if (ts != null) { //se aula for vazio, instanciamos o objeto - JInternalFrame toc = new TelaTocadorInterno(); - //GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - //gd.setFullScreenWindow(ts); - toc.setVisible(true); //mostrar a tela aula + TelaPrincipal.botaoAbrirTocador(); } else { System.out.println("erro!"); ts.setVisible(true); @@ -217,20 +219,16 @@ private void imgPanelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:ev static LinkedList selecionado = new LinkedList(); static File novoRaiz; static String nome; - - public static void listarTodosTutoriais() { - File raiz = new File("C:\\Tutoriais"); - lerDiretorio(raiz); - } - + File raiz = new File("./Tutoriais"); - public static LinkedList lerDiretorio(File raiz) { + public LinkedList lerDiretorio(File raiz) { String item = raiz.getName(); System.out.println(item); for (File f : raiz.listFiles()) { if (f.isDirectory()) { + String nome = f.getName(); novoRaiz = f.getAbsoluteFile(); System.out.println("\t" + novoRaiz); for (File f1 : novoRaiz.listFiles()) { @@ -246,7 +244,7 @@ public static LinkedList lerDiretorio(File raiz) { public void desenharMiniaturaTutorial() { String dirArquivo; - listarTodosTutoriais(); + lerDiretorio(raiz); for (int i = 0; i < itens.size(); i++) { dirArquivo = itens.get(i).toString(); selecionado.add(dirArquivo); @@ -263,6 +261,7 @@ public void desenharMiniaturaTutorial() { imgPanel.add(new JLabel(newIcon)); imgPanel.repaint(); } + } @@ -296,7 +295,7 @@ public ArrayList buscar(File arquivo, String palavra, ArrayList lista) { } return lista; } - LeitorXML l = new LeitorXML(); + // Variables declaration - do not modify//GEN-BEGIN:variables @@ -315,12 +314,12 @@ public ArrayList buscar(File arquivo, String palavra, ArrayList lista) { // End of variables declaration//GEN-END:variables public void exibirDados() { - l.lerXML(); - conteudoTitulo.setText(l.infoTitulo()); - conteudoAutor.setText(l.infoAutor()); - conteudoAno.setText(l.infoAno()); - conteudoDescricao.setText(l.infoDescricao()); - conteudoArea.setText(l.infoArea()); + + conteudoTitulo.setText(TutorialXml.lerXml().getTitulo()); + conteudoAutor.setText(TutorialXml.lerXml().getAutor()); + conteudoAno.setText(TutorialXml.lerXml().getAno()); + conteudoDescricao.setText(TutorialXml.lerXml().getDescricao()); + conteudoArea.setText(TutorialXml.lerXml().getArea()); desenharMiniaturaTutorial(); } diff --git a/src/iged/gui/gerenciador/TocadorDeSlideRodando.java b/src/iged/gui/gerenciador/TocadorDeSlideRodando.java index d303412..c58240f 100644 --- a/src/iged/gui/gerenciador/TocadorDeSlideRodando.java +++ b/src/iged/gui/gerenciador/TocadorDeSlideRodando.java @@ -17,6 +17,7 @@ import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; import java.awt.Image; +import java.awt.image.BufferedImage; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -25,6 +26,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JLabel; @@ -44,6 +46,7 @@ public TocadorDeSlideRodando() { initComponents(); desenhar(); + lerDiretorio(raiz); arquivos = new LinkedList(); indexPicture = 1; @@ -60,19 +63,16 @@ private void initComponents() { javax.swing.GroupLayout jFrame1Layout = new javax.swing.GroupLayout(jFrame1.getContentPane()); jFrame1.getContentPane().setLayout(jFrame1Layout); jFrame1Layout.setHorizontalGroup( - jFrame1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 400, Short.MAX_VALUE) - ); + jFrame1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 400, Short.MAX_VALUE)); jFrame1Layout.setVerticalGroup( - jFrame1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 300, Short.MAX_VALUE) - ); + jFrame1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 300, Short.MAX_VALUE)); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setBackground(new java.awt.Color(0, 204, 0)); anterior.setText("<<"); anterior.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { anteriorActionPerformed(evt); } @@ -80,6 +80,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { proximo.setText(">>"); proximo.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { proximoActionPerformed(evt); } @@ -94,46 +95,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 584, Short.MAX_VALUE) - ); + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 584, Short.MAX_VALUE)); jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 352, Short.MAX_VALUE) - ); + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGap(0, 352, Short.MAX_VALUE)); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(246, 246, 246) - .addComponent(anterior) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 248, Short.MAX_VALUE) - .addComponent(proximo) - .addGap(280, 280, 280)) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) - .addGroup(layout.createSequentialGroup() - .addGap(136, 136, 136) - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(150, Short.MAX_VALUE)) - ); + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup().addGap(246, 246, 246).addComponent(anterior).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 248, Short.MAX_VALUE).addComponent(proximo).addGap(280, 280, 280)).addGroup(layout.createSequentialGroup().addContainerGap().addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addContainerGap()).addGroup(layout.createSequentialGroup().addGap(136, 136, 136).addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addContainerGap(150, Short.MAX_VALUE))); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addGap(110, 110, 110) - .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(167, 167, 167) - .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(20, 20, 20) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(proximo) - .addComponent(anterior)) - .addContainerGap()) - ); + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup().addGap(110, 110, 110).addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(167, 167, 167).addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(20, 20, 20).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(proximo).addComponent(anterior)).addContainerGap())); pack(); } @@ -229,6 +200,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { }// //GEN-END:initComponents **/ + private static final File raiz = new File("./Tutoriais"); protected static ArrayList itens = new ArrayList(); static String imagemArray; static ArrayList selecionado = new ArrayList(); @@ -240,12 +212,7 @@ public ArrayList getItens() { return itens; } - public static void listarTodosTutoriais() { - File raiz = new File("C:\\Tutoriais"); - lerDiretorio(raiz); - } - - public static void lerDiretorio(File raiz) { + public static ArrayList lerDiretorio(File raiz) { String item = raiz.getName(); System.out.println(item); @@ -255,7 +222,7 @@ public static void lerDiretorio(File raiz) { novoRaiz = f.getAbsoluteFile(); System.out.println("\t" + novoRaiz); for (File f1 : novoRaiz.listFiles()) { - if (f1.isFile()) { + if (f1.isFile() && f1.getName().contains("Slide")) { itens.add(f1); System.out.println(f1.getName()); } @@ -264,67 +231,72 @@ public static void lerDiretorio(File raiz) { } } + return itens; } - public void desenhar(){ - setVisible(true); - - ImageIcon icone = new ImageIcon("C:\\Tutoriais\\teste1\\Slide0.jpg"); - JLabel L1 = new JLabel(icone); - jPanel1.add(L1); - getContentPane().setLayout(new FlowLayout()); - getContentPane().add(L1); + /* + public void reproduzir() throws IOException { + String arqSelecionado = null; + for (int i = 0; i < lerDiretorio(raiz).size(); i++) { + arqSelecionado = lerDiretorio(raiz).get(i).toString(); + BufferedImage imagem = ImageIO.read(new File(arqSelecionado)); + System.out.println(arqSelecionado); + } } + Portifolio pf = PortifolioXml.lerXml(); + String id; - public void pintar() { - //panelImg.removeAll(); - for (int i = 0; i < itens.size(); i++) { - jPanel1.removeAll(); - imagemArray = itens.get(i).getAbsolutePath(); - ImageIcon img = new ImageIcon(imagemArray); - Image newimg = img.getImage().getScaledInstance(100, 100, Image.SCALE_SMOOTH); - ImageIcon newIcon = new ImageIcon(newimg); - String nomeArquivo = imagemArray; - System.out.println(nomeArquivo); - jPanel1.add(new JLabel(newIcon)); - jPanel1.repaint(); - - //adiciona o panel no container - this.add(jPanel1, BorderLayout.CENTER); - jPanel1.repaint(); - this.pack(); - } + for (MetadadoAtividade mt + + : pf.getTarefas () + ) { + id = String.valueOf(mt.getId()); + dados.add(new String[]{mt.getTitulo(), mt.getArea(), id}); + System.out.println("Encontrado área:" + mt.getArea()); } - public static void listarArray() { + jTable1.setModel (modelo); - for (int i = 0; i < itens.size(); i++) { - imagemArray = itens.get(i).getAbsolutePath(); - System.out.println(imagemArray); - selecionado.add(imagemArray); - //labelImg.removeAll(); - } - } + jTable1.setSelectionMode (ListSelectionModel.SINGLE_SELECTION); - public void exibir() { - - //for (int i = 0; i < selecionado.size(); i++) { - //ImageIcon imagem = new ImageIcon(selecionado.get(i)); - ImageIcon imagem = new ImageIcon("C:\\Tutoriais\\tetsnatl\\Slide0.jpg"); - System.out.println(imagem); - Image newimg = imagem.getImage().getScaledInstance(100, 100, Image.SCALE_SMOOTH); + /* + ImageIO.write(imagem, "JPG", new File("./Tutoriais/" + getTituloStr() + "\\" + nome)); + System.out.println(nome); + if (nome.equals("Slide1.JPG")) { + ImageIcon icone = new ImageIcon("./Tutoriais/" + getTituloStr() + "\\" + nome); + Image newimg = icone.getImage().getScaledInstance(100, 100, Image.SCALE_SMOOTH); + ImageIcon newIcon = new ImageIcon(newimg); + JLabel L1 = new JLabel(newIcon); + imagemPanel.add(L1); + imagemPanel.setLayout(new FlowLayout(FlowLayout.CENTER)); + setVisible(true); + imagemPanel.repaint(); + } + + for (int i = 0; i < itens.size(); i++) { + imagemArray = itens.get(i).getAbsolutePath(); + System.out.println(imagemArray); + selecionado.add(imagemArray); + //labelImg.removeAll(); + } + } + */ + public void desenhar() { + setVisible(true); + for (int i = 0; i < getItens().size(); i++) { + ImageIcon icone = new ImageIcon(getItens().get(i).getAbsolutePath()); + Image newimg = icone.getImage().getScaledInstance(800, 600, Image.SCALE_SMOOTH); ImageIcon newIcon = new ImageIcon(newimg); - jPanel1.add(new JLabel(newIcon)); - jPanel1.repaint(); - jFrame1.pack(); - - //}*/ + JLabel L1 = new JLabel(newIcon); + jPanel1.add(L1); + jPanel1.setLayout(new FlowLayout(FlowLayout.CENTER)); + } } private void proximoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_proximoActionPerformed System.out.println("proximo..."); //proximo(); - exibir(); + //pintar(); }//GEN-LAST:event_proximoActionPerformed @@ -336,8 +308,7 @@ private void anteriorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS }//GEN-LAST:event_anteriorActionPerformed public void proximo() { - listarTodosTutoriais(); - listarArray(); + lerDiretorio(raiz); //indexPicture++; //} catch (IOException ex) { // Logger.getLogger(TocadorDeSlideRodando.class.getName()).log(Level.SEVERE, null, ex); @@ -345,8 +316,7 @@ public void proximo() { } public void anterior() { - listarTodosTutoriais(); - listarArray(); + lerDiretorio(raiz); //} catch (IOException ex) { // Logger.getLogger(TocadorDeSlideRodando.class.getName()).log(Level.SEVERE, null, ex); //} From fb8ac35fc5b943bbdb20b4f1b8f66a8573ad5552 Mon Sep 17 00:00:00 2001 From: Gilberto Farias de Sousa Filho Date: Mon, 9 Apr 2012 23:49:03 -0300 Subject: [PATCH 2/6] =?UTF-8?q?Adi=E7=E3o=20do=20componente=20iged.tutor.n?= =?UTF-8?q?cm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iged/tutor/ncm/Anchor.java | 10 ++++++++ src/iged/tutor/ncm/CompositeNode.java | 27 ++++++++++++++++++++ src/iged/tutor/ncm/ContentNode.java | 10 ++++++++ src/iged/tutor/ncm/ContextNode.java | 20 +++++++++++++++ src/iged/tutor/ncm/Entity.java | 36 +++++++++++++++++++++++++++ src/iged/tutor/ncm/Interface.java | 10 ++++++++ src/iged/tutor/ncm/Link.java | 10 ++++++++ src/iged/tutor/ncm/Node.java | 21 ++++++++++++++++ src/iged/tutor/ncm/Port.java | 21 ++++++++++++++++ src/iged/tutor/ncm/Trail.java | 30 ++++++++++++++++++++++ 10 files changed, 195 insertions(+) create mode 100644 src/iged/tutor/ncm/Anchor.java create mode 100644 src/iged/tutor/ncm/CompositeNode.java create mode 100644 src/iged/tutor/ncm/ContentNode.java create mode 100644 src/iged/tutor/ncm/ContextNode.java create mode 100644 src/iged/tutor/ncm/Entity.java create mode 100644 src/iged/tutor/ncm/Interface.java create mode 100644 src/iged/tutor/ncm/Link.java create mode 100644 src/iged/tutor/ncm/Node.java create mode 100644 src/iged/tutor/ncm/Port.java create mode 100644 src/iged/tutor/ncm/Trail.java diff --git a/src/iged/tutor/ncm/Anchor.java b/src/iged/tutor/ncm/Anchor.java new file mode 100644 index 0000000..5fc01ac --- /dev/null +++ b/src/iged/tutor/ncm/Anchor.java @@ -0,0 +1,10 @@ + +package iged.tutor.ncm; + +/** + * + * @author GILBERTO FARIAS + */ +public class Anchor extends Interface{ + +} diff --git a/src/iged/tutor/ncm/CompositeNode.java b/src/iged/tutor/ncm/CompositeNode.java new file mode 100644 index 0000000..acc6e7d --- /dev/null +++ b/src/iged/tutor/ncm/CompositeNode.java @@ -0,0 +1,27 @@ + +package iged.tutor.ncm; + +import java.util.List; + +/** + * + * @author GILBERTO FARIAS + */ +public abstract class CompositeNode extends Node{ + List ports; + List nodes; + + public void add(Node n){ + this.nodes.add(n); + } + public void remove(Node n){ + this.nodes.remove(n); + } + + public void add(Port p){ + this.ports.add(p); + } + public void remove(Port p){ + this.ports.remove(p); + } +} diff --git a/src/iged/tutor/ncm/ContentNode.java b/src/iged/tutor/ncm/ContentNode.java new file mode 100644 index 0000000..7c5708d --- /dev/null +++ b/src/iged/tutor/ncm/ContentNode.java @@ -0,0 +1,10 @@ + +package iged.tutor.ncm; + +/** + * + * @author GILBERTO FARIAS + */ +public abstract class ContentNode extends Node{ + +} diff --git a/src/iged/tutor/ncm/ContextNode.java b/src/iged/tutor/ncm/ContextNode.java new file mode 100644 index 0000000..ce9f104 --- /dev/null +++ b/src/iged/tutor/ncm/ContextNode.java @@ -0,0 +1,20 @@ + +package iged.tutor.ncm; + +import java.util.List; + +/** + * + * @author GILBERTO FARIAS + */ +public class ContextNode extends CompositeNode{ + List links; + + public void add(Link l){ + this.links.add(l); + } + public void remove(Link l){ + this.links.remove(l); + } + +} diff --git a/src/iged/tutor/ncm/Entity.java b/src/iged/tutor/ncm/Entity.java new file mode 100644 index 0000000..2856d50 --- /dev/null +++ b/src/iged/tutor/ncm/Entity.java @@ -0,0 +1,36 @@ + +package iged.tutor.ncm; + +/** + * + * @author GILBERTO FARIAS + */ +public abstract class Entity { + private int id; + private String name; + private String description; + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/iged/tutor/ncm/Interface.java b/src/iged/tutor/ncm/Interface.java new file mode 100644 index 0000000..c20e03c --- /dev/null +++ b/src/iged/tutor/ncm/Interface.java @@ -0,0 +1,10 @@ + +package iged.tutor.ncm; + +/** + * + * @author GILBERTO FARIAS + */ +public abstract class Interface extends Entity{ + +} diff --git a/src/iged/tutor/ncm/Link.java b/src/iged/tutor/ncm/Link.java new file mode 100644 index 0000000..434225c --- /dev/null +++ b/src/iged/tutor/ncm/Link.java @@ -0,0 +1,10 @@ + +package iged.tutor.ncm; + +/** + * + * @author GILBERTO FARIAS + */ +class Link extends Entity{ + +} diff --git a/src/iged/tutor/ncm/Node.java b/src/iged/tutor/ncm/Node.java new file mode 100644 index 0000000..99fcaf2 --- /dev/null +++ b/src/iged/tutor/ncm/Node.java @@ -0,0 +1,21 @@ + +package iged.tutor.ncm; + +import java.util.List; + +/** + * + * @author GILBERTO FARIAS + */ +public abstract class Node extends Entity{ + List anchors; + + public void add(Anchor a){ + this.anchors.add(a); + } + + public void remove(Anchor a){ + this.anchors.remove(a); + } + +} diff --git a/src/iged/tutor/ncm/Port.java b/src/iged/tutor/ncm/Port.java new file mode 100644 index 0000000..ee501f3 --- /dev/null +++ b/src/iged/tutor/ncm/Port.java @@ -0,0 +1,21 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package iged.tutor.ncm; + +/** + * + * @author GILBERTO FARIAS + */ +public class Port extends Interface{ + Node node; + + public Node getNode() { + return node; + } + + public void setNode(Node node) { + this.node = node; + } +} diff --git a/src/iged/tutor/ncm/Trail.java b/src/iged/tutor/ncm/Trail.java new file mode 100644 index 0000000..c5986f7 --- /dev/null +++ b/src/iged/tutor/ncm/Trail.java @@ -0,0 +1,30 @@ + +package iged.tutor.ncm; + +/** + * + * @author GILBERTO FARIAS + */ +public class Trail extends CompositeNode{ + int currentNode = -1; + + public Node getCurrentNode() { + if((currentNode >= 0) || (currentNode > this.nodes.size())) + return null; + return this.nodes.get(currentNode); + } + + public void home(){ + currentNode = 0; + } + + public void next(){ + currentNode = (currentNode + 1) % this.nodes.size(); + } + + public void previus(){ + --currentNode; + if(currentNode < 0) + currentNode = this.nodes.size() - 1; + } +} From 19cd875ffca5a83a7de9b26e59015d0205d3e61c Mon Sep 17 00:00:00 2001 From: Gilberto Farias de Sousa Filho Date: Wed, 11 Apr 2012 22:18:54 -0300 Subject: [PATCH 3/6] O pacote iged foi adcionado ao pacote br.ufpb --- src/EX1VetorLista.java | 18 +- src/Ex1InvertVetor.java | 18 +- src/Ex2Listas.java | 18 +- src/IGED.java | 10 +- src/MainTree.java | 8 +- src/TesteBinaryTree.java | 14 +- src/{ => br/ufpb}/iged/GraficoAED.java | 12 +- src/{ => br/ufpb}/iged/IGEDConst.java | 2 +- src/{ => br/ufpb}/iged/Interpretador.java | 4 +- .../ufpb/iged/avaliador}/AED/Appraiser.java | 106 ++-- .../ufpb/iged/avaliador}/AED/LinkedList.java | 174 +++--- .../iged/avaliador}/AED/LinkedListNode.java | 128 ++--- .../ufpb/iged/avaliador}/AED/Node.java | 38 +- .../ufpb/iged/avaliador}/AED/Struct.java | 56 +- .../iged/avaliador}/AED/StructFactory.java | 150 ++--- .../iged/avaliador}/AED/StructManager.java | 496 ++++++++--------- .../avaliador}/AED/StructManagerInstance.java | 4 +- .../ufpb/iged/avaliador}/AED/Vector.java | 148 ++--- .../iged/avaliador}/AED/WrapperStruct.java | 2 +- .../CampoInvalidoException.java | 2 +- .../CampoObrigatorioException.java | 2 +- .../DiretorioExistenteException.java | 2 +- .../gerenciadorApresentacao/Tutorial.java | 2 +- .../gerenciadorApresentacao/TutorialXml.java | 4 +- .../XmlPersistencia.java | 6 +- .../CampoInvalidoException.java | 2 +- .../CampoObrigatorioException.java | 2 +- .../DiretorioExistenteException.java | 2 +- .../GerenciadorAtividade.java | 12 +- .../iged/gerenciadorIGEDlet/IGEDlet.java} | 28 +- .../iged/gerenciadorIGEDlet/IGEDletDAO.java} | 10 +- .../gerenciadorIGEDlet/IGEDletEvent.java} | 10 +- .../gerenciadorIGEDlet/IGEDletListener.java | 16 + .../gerenciadorIGEDlet/IGEDletSubjetiva.java} | 30 +- .../IGEDletSubjetivaDAO.java} | 4 +- .../iged/gerenciadorIGEDlet/IGEDletXml.java | 63 +++ .../iged/gerenciadorIGEDlet/Metadado.java} | 6 +- .../iged/gerenciadorIGEDlet}/Portifolio.java | 12 +- .../gerenciadorIGEDlet}/PortifolioXml.java | 12 +- .../ufpb/iged/gerenciadorIGEDlet}/Xml.java | 12 +- .../gerenciadorIGEDlet}/XmlPersistencia.java | 8 +- .../ufpb}/iged/grafico/geometria/Circulo.java | 80 +-- .../ufpb}/iged/grafico/geometria/Label.java | 90 +-- .../iged/grafico/geometria/Poligono.java | 128 ++--- .../iged/grafico/geometria/Retangulo.java | 44 +- .../iged/grafico/manager/AcaoUsuario.java | 18 +- .../iged/grafico/manager/Desenhavel.java | 2 +- .../iged/grafico/manager/ExitListener.java | 28 +- .../iged/grafico/manager/GraphicManager.java | 20 +- .../iged/grafico/manager/PaintManager.java | 2 +- .../ufpb}/iged/grafico/manager/PaintUI.java | 238 ++++---- .../iged/grafico/manager/PoligonoGrafico.java | 238 ++++---- .../ufpb}/iged/grafico/manager/Quadro.java | 312 +++++------ .../manager/ReferenceExistingException.java | 2 +- .../grafico/manager/VarInteiroManager.java | 4 +- .../ufpb}/iged/grafico/struct/BinaryTree.java | 8 +- .../ufpb}/iged/grafico/struct/Celula.java | 84 +-- .../ufpb}/iged/grafico/struct/Elemento.java | 248 ++++----- .../ufpb}/iged/grafico/struct/LinkedList.java | 8 +- .../iged/grafico/struct/LinkedListNode.java | 514 +++++++++--------- .../ufpb}/iged/grafico/struct/Node.java | 4 +- .../ufpb}/iged/grafico/struct/NodeTree.java | 10 +- .../ufpb}/iged/grafico/struct/Null.java | 82 +-- .../ufpb}/iged/grafico/struct/Referencia.java | 278 +++++----- .../ufpb}/iged/grafico/struct/Seta.java | 146 ++--- .../ufpb}/iged/grafico/struct/Struct.java | 4 +- .../ufpb}/iged/grafico/struct/Traco.java | 8 +- .../ufpb}/iged/grafico/struct/VarInteiro.java | 82 +-- .../ufpb}/iged/grafico/struct/Vetor.java | 248 ++++----- .../iged/grafico/struct/WrapperStruct.java | 6 +- .../iged/gui/AreaInexistenteException.java | 2 +- src/{ => br/ufpb}/iged/gui/Cadastro.java | 12 +- .../ufpb}/iged/gui/CadastroTutorial.java | 2 +- .../iged/gui/CampoInvalidoException.java | 2 +- .../iged/gui/CampoObrigatorioException.java | 2 +- src/{ => br/ufpb}/iged/gui/CamposXML.java | 2 +- .../ufpb}/iged/gui/ConversorXmlTutorial.java | 2 +- .../iged/gui/DiretorioExistenteException.java | 2 +- src/{ => br/ufpb}/iged/gui/DocumentoXML.java | 2 +- src/{ => br/ufpb}/iged/gui/LeitorXML.java | 2 +- .../ufpb}/iged/gui/LeitorXMLGilberto.java | 2 +- .../iged/gui/TarefaInvalidaException.java | 2 +- .../iged/gui/TelaCadastradorDeTutorial.form | 0 .../iged/gui/TelaCadastradorDeTutorial.java | 6 +- .../ufpb}/iged/gui/TelaCadastradorXML.java | 10 +- .../ufpb}/iged/gui/TelaCadastroDeTarefa.form | 0 .../ufpb}/iged/gui/TelaCadastroDeTarefa.java | 40 +- .../iged/gui/TelaCadastroDeTarefaInterno.form | 0 .../iged/gui/TelaCadastroDeTarefaInterno.java | 40 +- .../gui/TelaCadastroDeTutorialInterno.form | 0 .../gui/TelaCadastroDeTutorialInterno.java | 22 +- .../TelaCadastroTarefaObjetivaInterno.form | 0 .../TelaCadastroTarefaObjetivaInterno.java | 2 +- src/{ => br/ufpb}/iged/gui/TelaExercicio.form | 0 src/{ => br/ufpb}/iged/gui/TelaExercicio.java | 20 +- .../ufpb}/iged/gui/TelaExercicioInterno.form | 0 .../ufpb}/iged/gui/TelaExercicioInterno.java | 28 +- src/{ => br/ufpb}/iged/gui/TelaInicial.form | 0 src/{ => br/ufpb}/iged/gui/TelaInicial.java | 2 +- .../ufpb}/iged/gui/TelaPesquisaInterno.form | 0 .../ufpb}/iged/gui/TelaPesquisaInterno.java | 28 +- src/{ => br/ufpb}/iged/gui/TelaPrincipal.form | 0 src/{ => br/ufpb}/iged/gui/TelaPrincipal.java | 2 +- .../iged/gui/TelaTarefaObjetivaInterno.form | 0 .../iged/gui/TelaTarefaObjetivaInterno.java | 2 +- .../ufpb}/iged/gui/TelaTocadorInterno.form | 0 .../ufpb}/iged/gui/TelaTocadorInterno.java | 2 +- .../iged/gui/TelaTutorialFrameInterno.form | 0 .../iged/gui/TelaTutorialFrameInterno.java | 4 +- src/{ => br/ufpb}/iged/gui/Thumbs.db | Bin src/{ => br/ufpb}/iged/gui/Tocador.form | 0 src/{ => br/ufpb}/iged/gui/Tocador.java | 2 +- src/{ => br/ufpb}/iged/gui/TutorialFrame.form | 0 src/{ => br/ufpb}/iged/gui/TutorialFrame.java | 6 +- .../ufpb}/iged/gui/TutorialFrameGilberto.java | 2 +- .../iged/gui/gerenciador/AnimacaoCodigo.java | 8 +- .../iged/gui/gerenciador/CadastroTarefa.java | 2 +- .../gerenciador/CampoInvalidoException.java | 2 +- .../CampoObrigatorioException.java | 2 +- .../gui/gerenciador/ConversorXmlTarefa.java | 4 +- .../DiretorioExistenteException.java | 2 +- .../gui/gerenciador/LeitorXmlGerenciador.java | 12 +- .../ufpb}/iged/gui/gerenciador/Pesquisa.form | 0 .../ufpb}/iged/gui/gerenciador/Pesquisa.java | 2 +- .../iged/gui/gerenciador/Portifolio.java | 2 +- .../iged/gui/gerenciador/PortifolioXml.java | 12 +- .../ufpb}/iged/gui/gerenciador/Questao.form | 0 .../ufpb}/iged/gui/gerenciador/Questao.java | 2 +- .../gui/gerenciador/TelaCadastroDeTarefa.form | 0 .../gui/gerenciador/TelaCadastroDeTarefa.java | 28 +- .../iged/gui/gerenciador/TelaExercicio.form | 0 .../iged/gui/gerenciador/TelaExercicio.java | 6 +- .../gerenciador/TocadorDeSlideRodando.form | 0 .../gerenciador/TocadorDeSlideRodando.java | 2 +- src/{ => br/ufpb}/iged/gui/tutorial.xml | 0 src/{ => br/ufpb}/iged/tutor/ncm/Anchor.java | 2 +- src/br/ufpb/iged/tutor/ncm/Bind.java | 28 + .../ufpb}/iged/tutor/ncm/CompositeNode.java | 15 +- .../ufpb}/iged/tutor/ncm/ContentNode.java | 2 +- .../ufpb}/iged/tutor/ncm/ContextNode.java | 12 +- src/{ => br/ufpb}/iged/tutor/ncm/Entity.java | 2 +- src/br/ufpb/iged/tutor/ncm/Glue.java | 10 + .../iged/tutor/ncm/HypermediaConnector.java | 33 ++ .../ufpb}/iged/tutor/ncm/Interface.java | 2 +- src/br/ufpb/iged/tutor/ncm/Link.java | 13 + src/{ => br/ufpb}/iged/tutor/ncm/Node.java | 6 +- src/{ => br/ufpb}/iged/tutor/ncm/Port.java | 14 +- src/br/ufpb/iged/tutor/ncm/Role.java | 47 ++ src/{ => br/ufpb}/iged/tutor/ncm/Trail.java | 10 +- .../AtividadeListener.java | 16 - .../gerenciadorAtividade/AtividadeXml.java | 109 ---- .../CampoInvalidoException.java | 16 - src/iged/gerenciadorAtividade/Portifolio.java | 42 -- .../gerenciadorAtividade/PortifolioXml.java | 67 --- src/iged/gerenciadorAtividade/Xml.java | 54 -- .../gerenciadorTarefa/GerenciadorTarefa.java | 69 --- .../gerenciadorTarefa/MetadadoTarefa.java | 56 -- src/iged/gerenciadorTarefa/Tarefa.java | 54 -- src/iged/gerenciadorTarefa/TarefaXml.java | 112 ---- .../gerenciadorTarefa/XmlPersistencia.java | 98 ---- src/iged/grafico/manager/Apontadores.java | 167 ------ .../CampoObrigatorioException.java | 16 - .../DiretorioExistenteException.java | 16 - src/iged/tutor/ncm/Link.java | 10 - 164 files changed, 2684 insertions(+), 3341 deletions(-) rename src/{ => br/ufpb}/iged/GraficoAED.java (93%) rename src/{ => br/ufpb}/iged/IGEDConst.java (96%) rename src/{ => br/ufpb}/iged/Interpretador.java (99%) rename src/{iged => br/ufpb/iged/avaliador}/AED/Appraiser.java (94%) rename src/{iged => br/ufpb/iged/avaliador}/AED/LinkedList.java (93%) rename src/{iged => br/ufpb/iged/avaliador}/AED/LinkedListNode.java (90%) rename src/{iged => br/ufpb/iged/avaliador}/AED/Node.java (87%) rename src/{iged => br/ufpb/iged/avaliador}/AED/Struct.java (90%) rename src/{iged => br/ufpb/iged/avaliador}/AED/StructFactory.java (94%) rename src/{iged => br/ufpb/iged/avaliador}/AED/StructManager.java (96%) rename src/{iged => br/ufpb/iged/avaliador}/AED/StructManagerInstance.java (98%) rename src/{iged => br/ufpb/iged/avaliador}/AED/Vector.java (92%) rename src/{iged => br/ufpb/iged/avaliador}/AED/WrapperStruct.java (86%) rename src/{ => br/ufpb}/iged/gerenciadorApresentacao/CampoInvalidoException.java (85%) rename src/{ => br/ufpb}/iged/gerenciadorApresentacao/CampoObrigatorioException.java (85%) rename src/{ => br/ufpb}/iged/gerenciadorApresentacao/DiretorioExistenteException.java (85%) rename src/{ => br/ufpb}/iged/gerenciadorApresentacao/Tutorial.java (96%) rename src/{ => br/ufpb}/iged/gerenciadorApresentacao/TutorialXml.java (95%) rename src/{ => br/ufpb}/iged/gerenciadorApresentacao/XmlPersistencia.java (95%) rename src/{iged/gerenciadorTarefa => br/ufpb/iged/gerenciadorIGEDlet}/CampoInvalidoException.java (86%) rename src/{iged/gerenciadorTarefa => br/ufpb/iged/gerenciadorIGEDlet}/CampoObrigatorioException.java (86%) rename src/{iged/gerenciadorAtividade => br/ufpb/iged/gerenciadorIGEDlet}/DiretorioExistenteException.java (86%) rename src/{iged/gerenciadorAtividade => br/ufpb/iged/gerenciadorIGEDlet}/GerenciadorAtividade.java (71%) rename src/{iged/gerenciadorAtividade/Atividade.java => br/ufpb/iged/gerenciadorIGEDlet/IGEDlet.java} (60%) rename src/{iged/gerenciadorAtividade/AtividadeDAO.java => br/ufpb/iged/gerenciadorIGEDlet/IGEDletDAO.java} (66%) rename src/{iged/gerenciadorAtividade/AtividadeEvent.java => br/ufpb/iged/gerenciadorIGEDlet/IGEDletEvent.java} (75%) create mode 100644 src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletListener.java rename src/{iged/gerenciadorAtividade/AtividadeSubjetiva.java => br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetiva.java} (72%) rename src/{iged/gerenciadorAtividade/AtividadeSubjetivaDAO.java => br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetivaDAO.java} (86%) create mode 100644 src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletXml.java rename src/{iged/gerenciadorAtividade/MetadadoAtividade.java => br/ufpb/iged/gerenciadorIGEDlet/Metadado.java} (89%) rename src/{iged/gerenciadorTarefa => br/ufpb/iged/gerenciadorIGEDlet}/Portifolio.java (61%) rename src/{iged/gerenciadorTarefa => br/ufpb/iged/gerenciadorIGEDlet}/PortifolioXml.java (84%) rename src/{iged/gerenciadorTarefa => br/ufpb/iged/gerenciadorIGEDlet}/Xml.java (81%) rename src/{iged/gerenciadorAtividade => br/ufpb/iged/gerenciadorIGEDlet}/XmlPersistencia.java (94%) rename src/{ => br/ufpb}/iged/grafico/geometria/Circulo.java (91%) rename src/{ => br/ufpb}/iged/grafico/geometria/Label.java (90%) rename src/{ => br/ufpb}/iged/grafico/geometria/Poligono.java (89%) rename src/{ => br/ufpb}/iged/grafico/geometria/Retangulo.java (89%) rename src/{ => br/ufpb}/iged/grafico/manager/AcaoUsuario.java (83%) rename src/{ => br/ufpb}/iged/grafico/manager/Desenhavel.java (79%) rename src/{ => br/ufpb}/iged/grafico/manager/ExitListener.java (89%) rename src/{ => br/ufpb}/iged/grafico/manager/GraphicManager.java (96%) rename src/{ => br/ufpb}/iged/grafico/manager/PaintManager.java (86%) rename src/{ => br/ufpb}/iged/grafico/manager/PaintUI.java (95%) rename src/{ => br/ufpb}/iged/grafico/manager/PoligonoGrafico.java (95%) rename src/{ => br/ufpb}/iged/grafico/manager/Quadro.java (92%) rename src/{ => br/ufpb}/iged/grafico/manager/ReferenceExistingException.java (83%) rename src/{ => br/ufpb}/iged/grafico/manager/VarInteiroManager.java (96%) rename src/{ => br/ufpb}/iged/grafico/struct/BinaryTree.java (96%) rename src/{ => br/ufpb}/iged/grafico/struct/Celula.java (83%) rename src/{ => br/ufpb}/iged/grafico/struct/Elemento.java (91%) rename src/{ => br/ufpb}/iged/grafico/struct/LinkedList.java (97%) rename src/{ => br/ufpb}/iged/grafico/struct/LinkedListNode.java (93%) rename src/{ => br/ufpb}/iged/grafico/struct/Node.java (95%) rename src/{ => br/ufpb}/iged/grafico/struct/NodeTree.java (97%) rename src/{ => br/ufpb}/iged/grafico/struct/Null.java (87%) rename src/{ => br/ufpb}/iged/grafico/struct/Referencia.java (93%) rename src/{ => br/ufpb}/iged/grafico/struct/Seta.java (90%) rename src/{ => br/ufpb}/iged/grafico/struct/Struct.java (97%) rename src/{ => br/ufpb}/iged/grafico/struct/Traco.java (90%) rename src/{ => br/ufpb}/iged/grafico/struct/VarInteiro.java (82%) rename src/{ => br/ufpb}/iged/grafico/struct/Vetor.java (91%) rename src/{ => br/ufpb}/iged/grafico/struct/WrapperStruct.java (98%) rename src/{ => br/ufpb}/iged/gui/AreaInexistenteException.java (91%) rename src/{ => br/ufpb}/iged/gui/Cadastro.java (98%) rename src/{ => br/ufpb}/iged/gui/CadastroTutorial.java (97%) rename src/{ => br/ufpb}/iged/gui/CampoInvalidoException.java (91%) rename src/{ => br/ufpb}/iged/gui/CampoObrigatorioException.java (90%) rename src/{ => br/ufpb}/iged/gui/CamposXML.java (97%) rename src/{ => br/ufpb}/iged/gui/ConversorXmlTutorial.java (99%) rename src/{ => br/ufpb}/iged/gui/DiretorioExistenteException.java (91%) rename src/{ => br/ufpb}/iged/gui/DocumentoXML.java (95%) rename src/{ => br/ufpb}/iged/gui/LeitorXML.java (99%) rename src/{ => br/ufpb}/iged/gui/LeitorXMLGilberto.java (99%) rename src/{ => br/ufpb}/iged/gui/TarefaInvalidaException.java (91%) rename src/{ => br/ufpb}/iged/gui/TelaCadastradorDeTutorial.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaCadastradorDeTutorial.java (99%) rename src/{ => br/ufpb}/iged/gui/TelaCadastradorXML.java (98%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroDeTarefa.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroDeTarefa.java (98%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroDeTarefaInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroDeTarefaInterno.java (97%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroDeTutorialInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroDeTutorialInterno.java (98%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroTarefaObjetivaInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaCadastroTarefaObjetivaInterno.java (99%) rename src/{ => br/ufpb}/iged/gui/TelaExercicio.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaExercicio.java (98%) rename src/{ => br/ufpb}/iged/gui/TelaExercicioInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaExercicioInterno.java (95%) rename src/{ => br/ufpb}/iged/gui/TelaInicial.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaInicial.java (99%) rename src/{ => br/ufpb}/iged/gui/TelaPesquisaInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaPesquisaInterno.java (96%) rename src/{ => br/ufpb}/iged/gui/TelaPrincipal.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaPrincipal.java (99%) rename src/{ => br/ufpb}/iged/gui/TelaTarefaObjetivaInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaTarefaObjetivaInterno.java (98%) rename src/{ => br/ufpb}/iged/gui/TelaTocadorInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaTocadorInterno.java (99%) rename src/{ => br/ufpb}/iged/gui/TelaTutorialFrameInterno.form (100%) rename src/{ => br/ufpb}/iged/gui/TelaTutorialFrameInterno.java (99%) rename src/{ => br/ufpb}/iged/gui/Thumbs.db (100%) rename src/{ => br/ufpb}/iged/gui/Tocador.form (100%) rename src/{ => br/ufpb}/iged/gui/Tocador.java (99%) rename src/{ => br/ufpb}/iged/gui/TutorialFrame.form (100%) rename src/{ => br/ufpb}/iged/gui/TutorialFrame.java (99%) rename src/{ => br/ufpb}/iged/gui/TutorialFrameGilberto.java (99%) rename src/{ => br/ufpb}/iged/gui/gerenciador/AnimacaoCodigo.java (93%) rename src/{ => br/ufpb}/iged/gui/gerenciador/CadastroTarefa.java (98%) rename src/{ => br/ufpb}/iged/gui/gerenciador/CampoInvalidoException.java (87%) rename src/{iged/gerenciadorAtividade => br/ufpb/iged/gui/gerenciador}/CampoObrigatorioException.java (87%) rename src/{ => br/ufpb}/iged/gui/gerenciador/ConversorXmlTarefa.java (93%) rename src/{iged/gerenciadorTarefa => br/ufpb/iged/gui/gerenciador}/DiretorioExistenteException.java (87%) rename src/{ => br/ufpb}/iged/gui/gerenciador/LeitorXmlGerenciador.java (95%) rename src/{ => br/ufpb}/iged/gui/gerenciador/Pesquisa.form (100%) rename src/{ => br/ufpb}/iged/gui/gerenciador/Pesquisa.java (99%) rename src/{ => br/ufpb}/iged/gui/gerenciador/Portifolio.java (96%) rename src/{ => br/ufpb}/iged/gui/gerenciador/PortifolioXml.java (85%) rename src/{ => br/ufpb}/iged/gui/gerenciador/Questao.form (100%) rename src/{ => br/ufpb}/iged/gui/gerenciador/Questao.java (99%) rename src/{ => br/ufpb}/iged/gui/gerenciador/TelaCadastroDeTarefa.form (100%) rename src/{ => br/ufpb}/iged/gui/gerenciador/TelaCadastroDeTarefa.java (98%) rename src/{ => br/ufpb}/iged/gui/gerenciador/TelaExercicio.form (100%) rename src/{ => br/ufpb}/iged/gui/gerenciador/TelaExercicio.java (99%) rename src/{ => br/ufpb}/iged/gui/gerenciador/TocadorDeSlideRodando.form (100%) rename src/{ => br/ufpb}/iged/gui/gerenciador/TocadorDeSlideRodando.java (99%) rename src/{ => br/ufpb}/iged/gui/tutorial.xml (100%) rename src/{ => br/ufpb}/iged/tutor/ncm/Anchor.java (72%) create mode 100644 src/br/ufpb/iged/tutor/ncm/Bind.java rename src/{ => br/ufpb}/iged/tutor/ncm/CompositeNode.java (65%) rename src/{ => br/ufpb}/iged/tutor/ncm/ContentNode.java (74%) rename src/{ => br/ufpb}/iged/tutor/ncm/ContextNode.java (55%) rename src/{ => br/ufpb}/iged/tutor/ncm/Entity.java (94%) create mode 100644 src/br/ufpb/iged/tutor/ncm/Glue.java create mode 100644 src/br/ufpb/iged/tutor/ncm/HypermediaConnector.java rename src/{ => br/ufpb}/iged/tutor/ncm/Interface.java (74%) create mode 100644 src/br/ufpb/iged/tutor/ncm/Link.java rename src/{ => br/ufpb}/iged/tutor/ncm/Node.java (73%) rename src/{ => br/ufpb}/iged/tutor/ncm/Port.java (59%) create mode 100644 src/br/ufpb/iged/tutor/ncm/Role.java rename src/{ => br/ufpb}/iged/tutor/ncm/Trail.java (76%) delete mode 100644 src/iged/gerenciadorAtividade/AtividadeListener.java delete mode 100644 src/iged/gerenciadorAtividade/AtividadeXml.java delete mode 100644 src/iged/gerenciadorAtividade/CampoInvalidoException.java delete mode 100644 src/iged/gerenciadorAtividade/Portifolio.java delete mode 100644 src/iged/gerenciadorAtividade/PortifolioXml.java delete mode 100644 src/iged/gerenciadorAtividade/Xml.java delete mode 100644 src/iged/gerenciadorTarefa/GerenciadorTarefa.java delete mode 100644 src/iged/gerenciadorTarefa/MetadadoTarefa.java delete mode 100644 src/iged/gerenciadorTarefa/Tarefa.java delete mode 100644 src/iged/gerenciadorTarefa/TarefaXml.java delete mode 100644 src/iged/gerenciadorTarefa/XmlPersistencia.java delete mode 100644 src/iged/grafico/manager/Apontadores.java delete mode 100644 src/iged/gui/gerenciador/CampoObrigatorioException.java delete mode 100644 src/iged/gui/gerenciador/DiretorioExistenteException.java delete mode 100644 src/iged/tutor/ncm/Link.java diff --git a/src/EX1VetorLista.java b/src/EX1VetorLista.java index 7b26d33..a5acf6c 100644 --- a/src/EX1VetorLista.java +++ b/src/EX1VetorLista.java @@ -1,12 +1,12 @@ -import iged.GraficoAED; -import iged.IGEDConst; -import iged.grafico.manager.AcaoUsuario; -import iged.grafico.manager.GraphicManager; -import iged.grafico.manager.PaintUI; -import iged.grafico.manager.Quadro; -import iged.grafico.struct.LinkedList; -import iged.grafico.struct.LinkedListNode; -import iged.grafico.struct.Struct; +import br.ufpb.iged.GraficoAED; +import br.ufpb.iged.IGEDConst; +import br.ufpb.iged.grafico.manager.AcaoUsuario; +import br.ufpb.iged.grafico.manager.GraphicManager; +import br.ufpb.iged.grafico.manager.PaintUI; +import br.ufpb.iged.grafico.manager.Quadro; +import br.ufpb.iged.grafico.struct.LinkedList; +import br.ufpb.iged.grafico.struct.LinkedListNode; +import br.ufpb.iged.grafico.struct.Struct; import java.util.Timer; import java.util.TimerTask; diff --git a/src/Ex1InvertVetor.java b/src/Ex1InvertVetor.java index 95a25f3..a843f9e 100644 --- a/src/Ex1InvertVetor.java +++ b/src/Ex1InvertVetor.java @@ -1,12 +1,12 @@ -import iged.GraficoAED; -import iged.IGEDConst; -import iged.grafico.manager.AcaoUsuario; -import iged.grafico.manager.GraphicManager; -import iged.grafico.manager.PaintUI; -import iged.grafico.manager.Quadro; -import iged.grafico.struct.LinkedList; -import iged.grafico.struct.LinkedListNode; -import iged.grafico.struct.Struct; +import br.ufpb.iged.GraficoAED; +import br.ufpb.iged.IGEDConst; +import br.ufpb.iged.grafico.manager.AcaoUsuario; +import br.ufpb.iged.grafico.manager.GraphicManager; +import br.ufpb.iged.grafico.manager.PaintUI; +import br.ufpb.iged.grafico.manager.Quadro; +import br.ufpb.iged.grafico.struct.LinkedList; +import br.ufpb.iged.grafico.struct.LinkedListNode; +import br.ufpb.iged.grafico.struct.Struct; public class Ex1InvertVetor implements AcaoUsuario { diff --git a/src/Ex2Listas.java b/src/Ex2Listas.java index 20c1293..c8e0ef6 100644 --- a/src/Ex2Listas.java +++ b/src/Ex2Listas.java @@ -1,12 +1,12 @@ -import iged.GraficoAED; -import iged.IGEDConst; -import iged.grafico.manager.AcaoUsuario; -import iged.grafico.manager.GraphicManager; -import iged.grafico.manager.PaintUI; -import iged.grafico.manager.Quadro; -import iged.grafico.struct.LinkedList; -import iged.grafico.struct.LinkedListNode; -import iged.grafico.struct.Struct; +import br.ufpb.iged.GraficoAED; +import br.ufpb.iged.IGEDConst; +import br.ufpb.iged.grafico.manager.AcaoUsuario; +import br.ufpb.iged.grafico.manager.GraphicManager; +import br.ufpb.iged.grafico.manager.PaintUI; +import br.ufpb.iged.grafico.manager.Quadro; +import br.ufpb.iged.grafico.struct.LinkedList; +import br.ufpb.iged.grafico.struct.LinkedListNode; +import br.ufpb.iged.grafico.struct.Struct; public class Ex2Listas implements AcaoUsuario { diff --git a/src/IGED.java b/src/IGED.java index ab49eaa..eafbe2b 100644 --- a/src/IGED.java +++ b/src/IGED.java @@ -1,8 +1,8 @@ -import iged.IGEDConst; -import iged.Interpretador; -import iged.grafico.manager.AcaoUsuario; -import iged.grafico.manager.PaintUI; -import iged.grafico.manager.Quadro; +import br.ufpb.iged.IGEDConst; +import br.ufpb.iged.Interpretador; +import br.ufpb.iged.grafico.manager.AcaoUsuario; +import br.ufpb.iged.grafico.manager.PaintUI; +import br.ufpb.iged.grafico.manager.Quadro; import java.util.StringTokenizer; public class IGED implements AcaoUsuario{ diff --git a/src/MainTree.java b/src/MainTree.java index c41f556..16cfb9c 100644 --- a/src/MainTree.java +++ b/src/MainTree.java @@ -1,8 +1,8 @@ -import iged.grafico.manager.AcaoUsuario; -import iged.grafico.manager.PaintUI; -import iged.grafico.manager.Quadro; -import iged.grafico.struct.NodeTree; +import br.ufpb.iged.grafico.manager.AcaoUsuario; +import br.ufpb.iged.grafico.manager.PaintUI; +import br.ufpb.iged.grafico.manager.Quadro; +import br.ufpb.iged.grafico.struct.NodeTree; import java.awt.geom.Point2D; diff --git a/src/TesteBinaryTree.java b/src/TesteBinaryTree.java index a07c4e1..7086d16 100644 --- a/src/TesteBinaryTree.java +++ b/src/TesteBinaryTree.java @@ -1,10 +1,10 @@ -import iged.IGEDConst; -import iged.grafico.manager.AcaoUsuario; -import iged.grafico.manager.GraphicManager; -import iged.grafico.manager.PaintUI; -import iged.grafico.manager.Quadro; -import iged.grafico.struct.BinaryTree; -import iged.grafico.struct.NodeTree; +import br.ufpb.iged.IGEDConst; +import br.ufpb.iged.grafico.manager.AcaoUsuario; +import br.ufpb.iged.grafico.manager.GraphicManager; +import br.ufpb.iged.grafico.manager.PaintUI; +import br.ufpb.iged.grafico.manager.Quadro; +import br.ufpb.iged.grafico.struct.BinaryTree; +import br.ufpb.iged.grafico.struct.NodeTree; import java.awt.geom.Point2D; diff --git a/src/iged/GraficoAED.java b/src/br/ufpb/iged/GraficoAED.java similarity index 93% rename from src/iged/GraficoAED.java rename to src/br/ufpb/iged/GraficoAED.java index 78658e3..6e3e654 100644 --- a/src/iged/GraficoAED.java +++ b/src/br/ufpb/iged/GraficoAED.java @@ -1,12 +1,12 @@ -package iged; +package br.ufpb.iged; -import iged.grafico.manager.ReferenceExistingException; +import br.ufpb.iged.grafico.manager.ReferenceExistingException; import java.util.List; -import iged.AED.Appraiser; -import iged.AED.StructManager; -import iged.grafico.manager.GraphicManager; -import iged.grafico.manager.Quadro; +import br.ufpb.iged.avaliador.AED.Appraiser; +import br.ufpb.iged.avaliador.AED.StructManager; +import br.ufpb.iged.grafico.manager.GraphicManager; +import br.ufpb.iged.grafico.manager.Quadro; public class GraficoAED { diff --git a/src/iged/IGEDConst.java b/src/br/ufpb/iged/IGEDConst.java similarity index 96% rename from src/iged/IGEDConst.java rename to src/br/ufpb/iged/IGEDConst.java index f7806c1..52698bc 100644 --- a/src/iged/IGEDConst.java +++ b/src/br/ufpb/iged/IGEDConst.java @@ -1,4 +1,4 @@ -package iged; +package br.ufpb.iged; public interface IGEDConst { diff --git a/src/iged/Interpretador.java b/src/br/ufpb/iged/Interpretador.java similarity index 99% rename from src/iged/Interpretador.java rename to src/br/ufpb/iged/Interpretador.java index cfd1109..9f43e56 100644 --- a/src/iged/Interpretador.java +++ b/src/br/ufpb/iged/Interpretador.java @@ -1,6 +1,6 @@ -package iged; +package br.ufpb.iged; -import iged.grafico.manager.*; +import br.ufpb.iged.grafico.manager.*; import java.util.StringTokenizer; /* diff --git a/src/iged/AED/Appraiser.java b/src/br/ufpb/iged/avaliador/AED/Appraiser.java similarity index 94% rename from src/iged/AED/Appraiser.java rename to src/br/ufpb/iged/avaliador/AED/Appraiser.java index 8dea33e..7963a7c 100644 --- a/src/iged/AED/Appraiser.java +++ b/src/br/ufpb/iged/avaliador/AED/Appraiser.java @@ -1,53 +1,53 @@ -package iged.AED; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.ArrayList; - - -public class Appraiser { - - private Map structOriginal; - private Map structReplica; - private List correct; - - public Appraiser(StructManager sm){ - structOriginal = new HashMap(); - structReplica = new HashMap(); - - for(String k : sm.original.struct.keySet()){ - this.structOriginal.put(k, sm.original.struct.get(k).getStruct()); - } - - for(String k : sm.replica.struct.keySet()){ - this.structReplica.put(k, sm.replica.struct.get(k).getStruct()); - } - - } - - public boolean compare(Struct s1, Struct s2){ - return s1.compare(s2); - } - - public boolean assess(){ - correct = new ArrayList(); - for(String keyAlun: this.structOriginal.keySet()){ - for(String keyProf: this.structReplica.keySet()){ - if(this.compare(this.structReplica.get(keyProf), this.structOriginal.get(keyAlun))){ - correct.add(keyAlun); - break; - } - } - - } - if(this.structReplica.size() == correct.size()){ - return true; - } - return false; - } - - public List correct(){ - return this.correct; - } - -} +package br.ufpb.iged.avaliador.AED; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.ArrayList; + + +public class Appraiser { + + private Map structOriginal; + private Map structReplica; + private List correct; + + public Appraiser(StructManager sm){ + structOriginal = new HashMap(); + structReplica = new HashMap(); + + for(String k : sm.original.struct.keySet()){ + this.structOriginal.put(k, sm.original.struct.get(k).getStruct()); + } + + for(String k : sm.replica.struct.keySet()){ + this.structReplica.put(k, sm.replica.struct.get(k).getStruct()); + } + + } + + public boolean compare(Struct s1, Struct s2){ + return s1.compare(s2); + } + + public boolean assess(){ + correct = new ArrayList(); + for(String keyAlun: this.structOriginal.keySet()){ + for(String keyProf: this.structReplica.keySet()){ + if(this.compare(this.structReplica.get(keyProf), this.structOriginal.get(keyAlun))){ + correct.add(keyAlun); + break; + } + } + + } + if(this.structReplica.size() == correct.size()){ + return true; + } + return false; + } + + public List correct(){ + return this.correct; + } + +} diff --git a/src/iged/AED/LinkedList.java b/src/br/ufpb/iged/avaliador/AED/LinkedList.java similarity index 93% rename from src/iged/AED/LinkedList.java rename to src/br/ufpb/iged/avaliador/AED/LinkedList.java index d9a6320..bafa6eb 100644 --- a/src/iged/AED/LinkedList.java +++ b/src/br/ufpb/iged/avaliador/AED/LinkedList.java @@ -1,87 +1,87 @@ -package iged.AED; - -import iged.IGEDConst; - -public class LinkedList extends Struct { - - private LinkedListNode start; - private int tamanho = 0; - - public LinkedList() { - super(IGEDConst.LISTA); - } - - public void setStart(LinkedListNode start) { - this.start = start; - } - - public LinkedListNode getStart() { - return this.start; - } - - @Override - public boolean compare(Struct lk) { - if(!(lk instanceof LinkedList)) - return false; - if (lk.getType() == IGEDConst.LISTA) { - LinkedList l = ((LinkedList) lk); - - if(this.tamanho != l.tamanho) - return false; - - LinkedListNode thisNode = this.start; - LinkedListNode lkNode = l.getStart(); - while (thisNode != null && lkNode != null) { - if (!thisNode.compare(lkNode)) { - return false; - } - thisNode = thisNode.next(); - lkNode = lkNode.next(); - } - if(thisNode == null && lkNode == null) - return true; - else - return false; - } - return false; - } - - @Override - public Node readField(int field) { - - switch (field) { - - case IGEDConst.LISTA_INICIO: - return this.start; - default: - break; - - } - return null; - } - - @Override - public void writeField(Struct n, int field) { - switch (field) { - case IGEDConst.LISTA_INICIO: - this.start = (LinkedListNode) n; - break; - - - default: - break; - - } - - } - - @Override - public void writeInfo(int value) { - this.tamanho = value; - } - - @Override - public int readInfo() { - return this.tamanho; - } -} +package br.ufpb.iged.avaliador.AED; + +import br.ufpb.iged.IGEDConst; + +public class LinkedList extends Struct { + + private LinkedListNode start; + private int tamanho = 0; + + public LinkedList() { + super(IGEDConst.LISTA); + } + + public void setStart(LinkedListNode start) { + this.start = start; + } + + public LinkedListNode getStart() { + return this.start; + } + + @Override + public boolean compare(Struct lk) { + if(!(lk instanceof LinkedList)) + return false; + if (lk.getType() == IGEDConst.LISTA) { + LinkedList l = ((LinkedList) lk); + + if(this.tamanho != l.tamanho) + return false; + + LinkedListNode thisNode = this.start; + LinkedListNode lkNode = l.getStart(); + while (thisNode != null && lkNode != null) { + if (!thisNode.compare(lkNode)) { + return false; + } + thisNode = thisNode.next(); + lkNode = lkNode.next(); + } + if(thisNode == null && lkNode == null) + return true; + else + return false; + } + return false; + } + + @Override + public Node readField(int field) { + + switch (field) { + + case IGEDConst.LISTA_INICIO: + return this.start; + default: + break; + + } + return null; + } + + @Override + public void writeField(Struct n, int field) { + switch (field) { + case IGEDConst.LISTA_INICIO: + this.start = (LinkedListNode) n; + break; + + + default: + break; + + } + + } + + @Override + public void writeInfo(int value) { + this.tamanho = value; + } + + @Override + public int readInfo() { + return this.tamanho; + } +} diff --git a/src/iged/AED/LinkedListNode.java b/src/br/ufpb/iged/avaliador/AED/LinkedListNode.java similarity index 90% rename from src/iged/AED/LinkedListNode.java rename to src/br/ufpb/iged/avaliador/AED/LinkedListNode.java index 9f90891..13f4f82 100644 --- a/src/iged/AED/LinkedListNode.java +++ b/src/br/ufpb/iged/avaliador/AED/LinkedListNode.java @@ -1,64 +1,64 @@ -package iged.AED; - -import iged.IGEDConst; - -public class LinkedListNode extends Node{ - - private LinkedListNode next; - - public LinkedListNode() { - super(IGEDConst.NODE); - } - - public void setNext(LinkedListNode nodeNext){ - this.next = nodeNext; - } - - public LinkedListNode next(){ - return this.next; - } - - @Override - public Node readField(int field) { - - switch(field){ - - case IGEDConst.NODE_PROX: - - return this.next; - - - default: - break; - - } - return null; - } - - @Override - public void writeField(Struct n, int field) { - if(field == IGEDConst.NODE_PROX){ - this.next = (LinkedListNode)n; - } - } - - @Override - public boolean compare(Struct node){ - if(node instanceof LinkedListNode) - return content == ((LinkedListNode)node).getContent(); - else - return false; - } - - @Override - public void writeInfo(int value) { - this.content = value; - - } - - @Override - public int readInfo() { - return this.content; - } - -} +package br.ufpb.iged.avaliador.AED; + +import br.ufpb.iged.IGEDConst; + +public class LinkedListNode extends Node{ + + private LinkedListNode next; + + public LinkedListNode() { + super(IGEDConst.NODE); + } + + public void setNext(LinkedListNode nodeNext){ + this.next = nodeNext; + } + + public LinkedListNode next(){ + return this.next; + } + + @Override + public Node readField(int field) { + + switch(field){ + + case IGEDConst.NODE_PROX: + + return this.next; + + + default: + break; + + } + return null; + } + + @Override + public void writeField(Struct n, int field) { + if(field == IGEDConst.NODE_PROX){ + this.next = (LinkedListNode)n; + } + } + + @Override + public boolean compare(Struct node){ + if(node instanceof LinkedListNode) + return content == ((LinkedListNode)node).getContent(); + else + return false; + } + + @Override + public void writeInfo(int value) { + this.content = value; + + } + + @Override + public int readInfo() { + return this.content; + } + +} diff --git a/src/iged/AED/Node.java b/src/br/ufpb/iged/avaliador/AED/Node.java similarity index 87% rename from src/iged/AED/Node.java rename to src/br/ufpb/iged/avaliador/AED/Node.java index 195c62f..2476faf 100644 --- a/src/iged/AED/Node.java +++ b/src/br/ufpb/iged/avaliador/AED/Node.java @@ -1,19 +1,19 @@ -package iged.AED; - -public abstract class Node extends Struct{ - - protected int content; - - public Node(int type){ - super(type); - } - - public int getContent(){ - return content; - } - - public void setContent(int content){ - this.content = content; - } - -} +package br.ufpb.iged.avaliador.AED; + +public abstract class Node extends Struct{ + + protected int content; + + public Node(int type){ + super(type); + } + + public int getContent(){ + return content; + } + + public void setContent(int content){ + this.content = content; + } + +} diff --git a/src/iged/AED/Struct.java b/src/br/ufpb/iged/avaliador/AED/Struct.java similarity index 90% rename from src/iged/AED/Struct.java rename to src/br/ufpb/iged/avaliador/AED/Struct.java index 462c482..338e688 100644 --- a/src/iged/AED/Struct.java +++ b/src/br/ufpb/iged/avaliador/AED/Struct.java @@ -1,28 +1,28 @@ -package iged.AED; - -public abstract class Struct{ - - private int type; - - public Struct(int type){ - this.type = type; - } - - public boolean equalsType(Struct s){ - return this.type == s.getType(); - } - - public int getType() { - return type; - } - - public abstract Node readField(int field); - - public abstract void writeField(Struct n ,int field); - - public abstract void writeInfo(int value); - - public abstract int readInfo(); - - public abstract boolean compare(Struct s); -} +package br.ufpb.iged.avaliador.AED; + +public abstract class Struct{ + + private int type; + + public Struct(int type){ + this.type = type; + } + + public boolean equalsType(Struct s){ + return this.type == s.getType(); + } + + public int getType() { + return type; + } + + public abstract Node readField(int field); + + public abstract void writeField(Struct n ,int field); + + public abstract void writeInfo(int value); + + public abstract int readInfo(); + + public abstract boolean compare(Struct s); +} diff --git a/src/iged/AED/StructFactory.java b/src/br/ufpb/iged/avaliador/AED/StructFactory.java similarity index 94% rename from src/iged/AED/StructFactory.java rename to src/br/ufpb/iged/avaliador/AED/StructFactory.java index 3bc945b..5e4e7c0 100644 --- a/src/iged/AED/StructFactory.java +++ b/src/br/ufpb/iged/avaliador/AED/StructFactory.java @@ -1,75 +1,75 @@ -package iged.AED; - -import iged.IGEDConst; - -public class StructFactory { - - private int lengthStruct = 10; - private static StructFactory sf = null; - - - private StructFactory(){ - - } - - public static synchronized StructFactory getInstance(){ - if(sf == null){ - sf = new StructFactory(); - } - return sf; - } - - public Struct createStruct(int type) { - Struct s; - switch (type) { - case IGEDConst.LISTA: - s = new LinkedList(); - break; - case IGEDConst.VETOR: - s = new Vector(lengthStruct); - break; - case IGEDConst.NODE: - s = new LinkedListNode(); - break; - default: - return null; - - } - return s; - //StructManager.pilha.add(new WrapperStruct(s)); - } - - /*public WrapperStruct duplicateStruct(Struct s) { - if (s != null) { - switch (s.getType()) { - - case IGEDConst.VETOR: - this.lengthStruct = ((Vector) s).getLength(); - this.createStruct(IGEDConst.VETOR); - return StructManager.pilha.pop(); - case IGEDConst.LISTA: - this.createStruct(IGEDConst.LISTA); - return StructManager.pilha.pop(); - case IGEDConst.NODE: - this.createStruct(IGEDConst.NODE); - return StructManager.pilha.pop(); - default: - return null; - } - } - else { - this.createStruct(IGEDConst.LISTA); - return StructManager.pilha.pop(); - } - }*/ - - - public void setLengthStruct(int lengthStruct) { - this.lengthStruct = lengthStruct; - } - - public int getLengthStruct() { - return this.lengthStruct; - } - -} +package br.ufpb.iged.avaliador.AED; + +import br.ufpb.iged.IGEDConst; + +public class StructFactory { + + private int lengthStruct = 10; + private static StructFactory sf = null; + + + private StructFactory(){ + + } + + public static synchronized StructFactory getInstance(){ + if(sf == null){ + sf = new StructFactory(); + } + return sf; + } + + public Struct createStruct(int type) { + Struct s; + switch (type) { + case IGEDConst.LISTA: + s = new LinkedList(); + break; + case IGEDConst.VETOR: + s = new Vector(lengthStruct); + break; + case IGEDConst.NODE: + s = new LinkedListNode(); + break; + default: + return null; + + } + return s; + //StructManager.pilha.add(new WrapperStruct(s)); + } + + /*public WrapperStruct duplicateStruct(Struct s) { + if (s != null) { + switch (s.getType()) { + + case IGEDConst.VETOR: + this.lengthStruct = ((Vector) s).getLength(); + this.createStruct(IGEDConst.VETOR); + return StructManager.pilha.pop(); + case IGEDConst.LISTA: + this.createStruct(IGEDConst.LISTA); + return StructManager.pilha.pop(); + case IGEDConst.NODE: + this.createStruct(IGEDConst.NODE); + return StructManager.pilha.pop(); + default: + return null; + } + } + else { + this.createStruct(IGEDConst.LISTA); + return StructManager.pilha.pop(); + } + }*/ + + + public void setLengthStruct(int lengthStruct) { + this.lengthStruct = lengthStruct; + } + + public int getLengthStruct() { + return this.lengthStruct; + } + +} diff --git a/src/iged/AED/StructManager.java b/src/br/ufpb/iged/avaliador/AED/StructManager.java similarity index 96% rename from src/iged/AED/StructManager.java rename to src/br/ufpb/iged/avaliador/AED/StructManager.java index 38fdfa0..c5778d0 100644 --- a/src/iged/AED/StructManager.java +++ b/src/br/ufpb/iged/avaliador/AED/StructManager.java @@ -1,248 +1,248 @@ -package iged.AED; - -import iged.IGEDConst; - -public class StructManager { - StructManagerInstance original; - StructManagerInstance replica; - private int mode; - private StructFactory factory; - - public StructManager() { - original = new StructManagerInstance(); - replica = new StructManagerInstance(); - factory = StructFactory.getInstance(); - mode = IGEDConst.MODE_BOTH; - } - - public boolean removeStruct(String id) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - return this.replica.removeStruct(id); - case IGEDConst.MODE_BOTH: - this.original.removeStruct(id); - return this.replica.removeStruct(id); - case IGEDConst.MODE_STUDENT: - return this.original.removeStruct(id); - default: - return false; - } - } - - public void setMode(int m) { - if (m == IGEDConst.MODE_BOTH || m == IGEDConst.MODE_STUDENT || m == IGEDConst.MODE_PROFESSOR) { - this.mode = m; - } - } - - public void set_LengthStruct(int lengthStruct) { - this.factory.setLengthStruct(lengthStruct); - } - - public void createStruct(int type) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.createStruct(type); - break; - case IGEDConst.MODE_BOTH: - this.original.createStruct(type); - this.replica.createStruct(type); - break; - case IGEDConst.MODE_STUDENT: - this.original.createStruct(type); - break; - default: - break; - } - } - - public void createReference(String id, int type) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.createReference(id, type); - break; - case IGEDConst.MODE_BOTH: - this.original.createReference(id, type); - this.replica.createReference(id, type); - break; - case IGEDConst.MODE_STUDENT: - this.original.createReference(id, type); - break; - default: - break; - } - } - - public void readReference(String id) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.readReference(id); - break; - case IGEDConst.MODE_BOTH: - this.original.readReference(id); - this.replica.readReference(id); - break; - case IGEDConst.MODE_STUDENT: - this.original.readReference(id); - break; - default: - break; - } - } - - public void writeReference() { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.writeReference(); - break; - case IGEDConst.MODE_BOTH: - this.original.writeReference(); - this.replica.writeReference(); - break; - case IGEDConst.MODE_STUDENT: - this.original.writeReference(); - break; - default: - break; - } - } - - public void readReferenceField(int field) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.readReferenceField(field); - break; - case IGEDConst.MODE_BOTH: - this.original.readReferenceField(field); - this.replica.readReferenceField(field); - break; - case IGEDConst.MODE_STUDENT: - this.original.readReferenceField(field); - break; - default: - break; - } - } - - public void writeReferenceField(int field) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.writeReferenceField(field); - break; - case IGEDConst.MODE_BOTH: - this.original.writeReferenceField(field); - this.replica.writeReferenceField(field); - break; - case IGEDConst.MODE_STUDENT: - this.original.writeReferenceField(field); - break; - default: - break; - } - } - - public void writeReferenceFieldNull(int field) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.writeReferenceFieldNull(field); - break; - case IGEDConst.MODE_BOTH: - this.original.writeReferenceFieldNull(field); - this.replica.writeReferenceFieldNull(field); - break; - case IGEDConst.MODE_STUDENT: - this.original.writeReferenceFieldNull(field); - break; - default: - break; - } - } - - public int readInfo() { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - return this.replica.readInfo(); - case IGEDConst.MODE_BOTH: - this.replica.readInfo(); - return this.original.readInfo(); - case IGEDConst.MODE_STUDENT: - return this.original.readInfo(); - - default: - return Integer.MIN_VALUE; - } - } - - public void writeInfo(int value) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.writeInfo(value); - break; - case IGEDConst.MODE_BOTH: - this.replica.writeInfo(value); - this.original.writeInfo(value); - break; - case IGEDConst.MODE_STUDENT: - this.original.writeInfo(value); - break; - default: - break; - } - } - - public void setPosVector(int pos) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.setPosVector(pos); - break; - case IGEDConst.MODE_BOTH: - this.replica.setPosVector(pos); - this.original.setPosVector(pos); - break; - case IGEDConst.MODE_STUDENT: - this.original.setPosVector(pos); - break; - default: - break; - } - } - - public void insertStruct(String id, Struct s) { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.insertStruct(id, s); - break; - case IGEDConst.MODE_BOTH: - this.replica.insertStruct(id, s); - this.original.insertStruct(id, s); - break; - case IGEDConst.MODE_STUDENT: - this.original.insertStruct(id, s); - break; - default: - break; - } - } - - public void endCommand() { - switch (mode) { - case IGEDConst.MODE_PROFESSOR: - this.replica.endCommand(); - break; - case IGEDConst.MODE_BOTH: - this.replica.endCommand(); - this.original.endCommand(); - break; - case IGEDConst.MODE_STUDENT: - this.original.endCommand(); - break; - default: - break; - } - } - - public void clear(){ - original.clear(); - replica.clear(); - } -} +package br.ufpb.iged.avaliador.AED; + +import br.ufpb.iged.IGEDConst; + +public class StructManager { + StructManagerInstance original; + StructManagerInstance replica; + private int mode; + private StructFactory factory; + + public StructManager() { + original = new StructManagerInstance(); + replica = new StructManagerInstance(); + factory = StructFactory.getInstance(); + mode = IGEDConst.MODE_BOTH; + } + + public boolean removeStruct(String id) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + return this.replica.removeStruct(id); + case IGEDConst.MODE_BOTH: + this.original.removeStruct(id); + return this.replica.removeStruct(id); + case IGEDConst.MODE_STUDENT: + return this.original.removeStruct(id); + default: + return false; + } + } + + public void setMode(int m) { + if (m == IGEDConst.MODE_BOTH || m == IGEDConst.MODE_STUDENT || m == IGEDConst.MODE_PROFESSOR) { + this.mode = m; + } + } + + public void set_LengthStruct(int lengthStruct) { + this.factory.setLengthStruct(lengthStruct); + } + + public void createStruct(int type) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.createStruct(type); + break; + case IGEDConst.MODE_BOTH: + this.original.createStruct(type); + this.replica.createStruct(type); + break; + case IGEDConst.MODE_STUDENT: + this.original.createStruct(type); + break; + default: + break; + } + } + + public void createReference(String id, int type) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.createReference(id, type); + break; + case IGEDConst.MODE_BOTH: + this.original.createReference(id, type); + this.replica.createReference(id, type); + break; + case IGEDConst.MODE_STUDENT: + this.original.createReference(id, type); + break; + default: + break; + } + } + + public void readReference(String id) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.readReference(id); + break; + case IGEDConst.MODE_BOTH: + this.original.readReference(id); + this.replica.readReference(id); + break; + case IGEDConst.MODE_STUDENT: + this.original.readReference(id); + break; + default: + break; + } + } + + public void writeReference() { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.writeReference(); + break; + case IGEDConst.MODE_BOTH: + this.original.writeReference(); + this.replica.writeReference(); + break; + case IGEDConst.MODE_STUDENT: + this.original.writeReference(); + break; + default: + break; + } + } + + public void readReferenceField(int field) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.readReferenceField(field); + break; + case IGEDConst.MODE_BOTH: + this.original.readReferenceField(field); + this.replica.readReferenceField(field); + break; + case IGEDConst.MODE_STUDENT: + this.original.readReferenceField(field); + break; + default: + break; + } + } + + public void writeReferenceField(int field) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.writeReferenceField(field); + break; + case IGEDConst.MODE_BOTH: + this.original.writeReferenceField(field); + this.replica.writeReferenceField(field); + break; + case IGEDConst.MODE_STUDENT: + this.original.writeReferenceField(field); + break; + default: + break; + } + } + + public void writeReferenceFieldNull(int field) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.writeReferenceFieldNull(field); + break; + case IGEDConst.MODE_BOTH: + this.original.writeReferenceFieldNull(field); + this.replica.writeReferenceFieldNull(field); + break; + case IGEDConst.MODE_STUDENT: + this.original.writeReferenceFieldNull(field); + break; + default: + break; + } + } + + public int readInfo() { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + return this.replica.readInfo(); + case IGEDConst.MODE_BOTH: + this.replica.readInfo(); + return this.original.readInfo(); + case IGEDConst.MODE_STUDENT: + return this.original.readInfo(); + + default: + return Integer.MIN_VALUE; + } + } + + public void writeInfo(int value) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.writeInfo(value); + break; + case IGEDConst.MODE_BOTH: + this.replica.writeInfo(value); + this.original.writeInfo(value); + break; + case IGEDConst.MODE_STUDENT: + this.original.writeInfo(value); + break; + default: + break; + } + } + + public void setPosVector(int pos) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.setPosVector(pos); + break; + case IGEDConst.MODE_BOTH: + this.replica.setPosVector(pos); + this.original.setPosVector(pos); + break; + case IGEDConst.MODE_STUDENT: + this.original.setPosVector(pos); + break; + default: + break; + } + } + + public void insertStruct(String id, Struct s) { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.insertStruct(id, s); + break; + case IGEDConst.MODE_BOTH: + this.replica.insertStruct(id, s); + this.original.insertStruct(id, s); + break; + case IGEDConst.MODE_STUDENT: + this.original.insertStruct(id, s); + break; + default: + break; + } + } + + public void endCommand() { + switch (mode) { + case IGEDConst.MODE_PROFESSOR: + this.replica.endCommand(); + break; + case IGEDConst.MODE_BOTH: + this.replica.endCommand(); + this.original.endCommand(); + break; + case IGEDConst.MODE_STUDENT: + this.original.endCommand(); + break; + default: + break; + } + } + + public void clear(){ + original.clear(); + replica.clear(); + } +} diff --git a/src/iged/AED/StructManagerInstance.java b/src/br/ufpb/iged/avaliador/AED/StructManagerInstance.java similarity index 98% rename from src/iged/AED/StructManagerInstance.java rename to src/br/ufpb/iged/avaliador/AED/StructManagerInstance.java index dd8f064..656cbc8 100644 --- a/src/iged/AED/StructManagerInstance.java +++ b/src/br/ufpb/iged/avaliador/AED/StructManagerInstance.java @@ -1,6 +1,6 @@ -package iged.AED; +package br.ufpb.iged.avaliador.AED; -import iged.IGEDConst; +import br.ufpb.iged.IGEDConst; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/src/iged/AED/Vector.java b/src/br/ufpb/iged/avaliador/AED/Vector.java similarity index 92% rename from src/iged/AED/Vector.java rename to src/br/ufpb/iged/avaliador/AED/Vector.java index 19d5d28..4c28d09 100644 --- a/src/iged/AED/Vector.java +++ b/src/br/ufpb/iged/avaliador/AED/Vector.java @@ -1,74 +1,74 @@ -package iged.AED; - -public class Vector extends Struct { - - private int[]vet ; - private int pos = 0; - - - public Vector(int length){ - super(1); - vet = new int[length]; - } - - public int read(int index)throws ArrayIndexOutOfBoundsException{ - return vet[index]; - } - - public boolean write(int index, int value){ - try{ - vet[index] = value; - return true; - }catch (ArrayIndexOutOfBoundsException ae) { - return false; - } - } - - public int getLength(){ - return vet.length; - } - - - public boolean compare(Struct o){ - if(!(o instanceof Vector)) - return false; - Vector v = ((Vector)o); - if(this.vet.length == v.vet.length ){ - int pos = 0; - for(int i: vet){ - if(i != v.vet[pos]){ - return false; - } - pos++; - } - }else { - return false; - } - return true; - } - - @Override - public Node readField(int field) { - return null; - } - - @Override - public void writeField(Struct n, int field) { - } - - @Override - public void writeInfo(int value) { - vet[pos] = value; - } - - @Override - public int readInfo() { - return vet[pos]; - } - - public void setField(int pos){ - this.pos = pos; - } - - -} +package br.ufpb.iged.avaliador.AED; + +public class Vector extends Struct { + + private int[]vet ; + private int pos = 0; + + + public Vector(int length){ + super(1); + vet = new int[length]; + } + + public int read(int index)throws ArrayIndexOutOfBoundsException{ + return vet[index]; + } + + public boolean write(int index, int value){ + try{ + vet[index] = value; + return true; + }catch (ArrayIndexOutOfBoundsException ae) { + return false; + } + } + + public int getLength(){ + return vet.length; + } + + + public boolean compare(Struct o){ + if(!(o instanceof Vector)) + return false; + Vector v = ((Vector)o); + if(this.vet.length == v.vet.length ){ + int pos = 0; + for(int i: vet){ + if(i != v.vet[pos]){ + return false; + } + pos++; + } + }else { + return false; + } + return true; + } + + @Override + public Node readField(int field) { + return null; + } + + @Override + public void writeField(Struct n, int field) { + } + + @Override + public void writeInfo(int value) { + vet[pos] = value; + } + + @Override + public int readInfo() { + return vet[pos]; + } + + public void setField(int pos){ + this.pos = pos; + } + + +} diff --git a/src/iged/AED/WrapperStruct.java b/src/br/ufpb/iged/avaliador/AED/WrapperStruct.java similarity index 86% rename from src/iged/AED/WrapperStruct.java rename to src/br/ufpb/iged/avaliador/AED/WrapperStruct.java index 463030c..fd249e6 100644 --- a/src/iged/AED/WrapperStruct.java +++ b/src/br/ufpb/iged/avaliador/AED/WrapperStruct.java @@ -1,4 +1,4 @@ -package iged.AED; +package br.ufpb.iged.avaliador.AED; public class WrapperStruct { diff --git a/src/iged/gerenciadorApresentacao/CampoInvalidoException.java b/src/br/ufpb/iged/gerenciadorApresentacao/CampoInvalidoException.java similarity index 85% rename from src/iged/gerenciadorApresentacao/CampoInvalidoException.java rename to src/br/ufpb/iged/gerenciadorApresentacao/CampoInvalidoException.java index c0df072..f372c30 100644 --- a/src/iged/gerenciadorApresentacao/CampoInvalidoException.java +++ b/src/br/ufpb/iged/gerenciadorApresentacao/CampoInvalidoException.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorApresentacao; +package br.ufpb.iged.gerenciadorApresentacao; /** * diff --git a/src/iged/gerenciadorApresentacao/CampoObrigatorioException.java b/src/br/ufpb/iged/gerenciadorApresentacao/CampoObrigatorioException.java similarity index 85% rename from src/iged/gerenciadorApresentacao/CampoObrigatorioException.java rename to src/br/ufpb/iged/gerenciadorApresentacao/CampoObrigatorioException.java index 82e4fbd..ad63854 100644 --- a/src/iged/gerenciadorApresentacao/CampoObrigatorioException.java +++ b/src/br/ufpb/iged/gerenciadorApresentacao/CampoObrigatorioException.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package iged.gerenciadorApresentacao; +package br.ufpb.iged.gerenciadorApresentacao; /** * diff --git a/src/iged/gerenciadorApresentacao/DiretorioExistenteException.java b/src/br/ufpb/iged/gerenciadorApresentacao/DiretorioExistenteException.java similarity index 85% rename from src/iged/gerenciadorApresentacao/DiretorioExistenteException.java rename to src/br/ufpb/iged/gerenciadorApresentacao/DiretorioExistenteException.java index d31fc0c..9f2011c 100644 --- a/src/iged/gerenciadorApresentacao/DiretorioExistenteException.java +++ b/src/br/ufpb/iged/gerenciadorApresentacao/DiretorioExistenteException.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package iged.gerenciadorApresentacao; +package br.ufpb.iged.gerenciadorApresentacao; /** * diff --git a/src/iged/gerenciadorApresentacao/Tutorial.java b/src/br/ufpb/iged/gerenciadorApresentacao/Tutorial.java similarity index 96% rename from src/iged/gerenciadorApresentacao/Tutorial.java rename to src/br/ufpb/iged/gerenciadorApresentacao/Tutorial.java index cf81dcc..04d12a5 100644 --- a/src/iged/gerenciadorApresentacao/Tutorial.java +++ b/src/br/ufpb/iged/gerenciadorApresentacao/Tutorial.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorApresentacao; +package br.ufpb.iged.gerenciadorApresentacao; import java.io.File; import java.util.LinkedList; diff --git a/src/iged/gerenciadorApresentacao/TutorialXml.java b/src/br/ufpb/iged/gerenciadorApresentacao/TutorialXml.java similarity index 95% rename from src/iged/gerenciadorApresentacao/TutorialXml.java rename to src/br/ufpb/iged/gerenciadorApresentacao/TutorialXml.java index c3f8664..6acd622 100644 --- a/src/iged/gerenciadorApresentacao/TutorialXml.java +++ b/src/br/ufpb/iged/gerenciadorApresentacao/TutorialXml.java @@ -2,11 +2,11 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorApresentacao; +package br.ufpb.iged.gerenciadorApresentacao; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; -import iged.gui.TelaCadastroDeTutorialInterno; +import br.ufpb.iged.gui.TelaCadastroDeTutorialInterno; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/iged/gerenciadorApresentacao/XmlPersistencia.java b/src/br/ufpb/iged/gerenciadorApresentacao/XmlPersistencia.java similarity index 95% rename from src/iged/gerenciadorApresentacao/XmlPersistencia.java rename to src/br/ufpb/iged/gerenciadorApresentacao/XmlPersistencia.java index 5e9d88f..a2faa2c 100644 --- a/src/iged/gerenciadorApresentacao/XmlPersistencia.java +++ b/src/br/ufpb/iged/gerenciadorApresentacao/XmlPersistencia.java @@ -2,10 +2,10 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorApresentacao; +package br.ufpb.iged.gerenciadorApresentacao; -import iged.gui.TelaCadastroDeTarefaInterno; -import iged.gui.TelaCadastroDeTutorialInterno; +import br.ufpb.iged.gui.TelaCadastroDeTarefaInterno; +import br.ufpb.iged.gui.TelaCadastroDeTutorialInterno; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/src/iged/gerenciadorTarefa/CampoInvalidoException.java b/src/br/ufpb/iged/gerenciadorIGEDlet/CampoInvalidoException.java similarity index 86% rename from src/iged/gerenciadorTarefa/CampoInvalidoException.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/CampoInvalidoException.java index 325fab8..009fb76 100644 --- a/src/iged/gerenciadorTarefa/CampoInvalidoException.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/CampoInvalidoException.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorTarefa; +package br.ufpb.iged.gerenciadorIGEDlet; /** * diff --git a/src/iged/gerenciadorTarefa/CampoObrigatorioException.java b/src/br/ufpb/iged/gerenciadorIGEDlet/CampoObrigatorioException.java similarity index 86% rename from src/iged/gerenciadorTarefa/CampoObrigatorioException.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/CampoObrigatorioException.java index daa4cd3..b0bc638 100644 --- a/src/iged/gerenciadorTarefa/CampoObrigatorioException.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/CampoObrigatorioException.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorTarefa; +package br.ufpb.iged.gerenciadorIGEDlet; /** * diff --git a/src/iged/gerenciadorAtividade/DiretorioExistenteException.java b/src/br/ufpb/iged/gerenciadorIGEDlet/DiretorioExistenteException.java similarity index 86% rename from src/iged/gerenciadorAtividade/DiretorioExistenteException.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/DiretorioExistenteException.java index 7378318..3e42cf5 100644 --- a/src/iged/gerenciadorAtividade/DiretorioExistenteException.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/DiretorioExistenteException.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; /** * diff --git a/src/iged/gerenciadorAtividade/GerenciadorAtividade.java b/src/br/ufpb/iged/gerenciadorIGEDlet/GerenciadorAtividade.java similarity index 71% rename from src/iged/gerenciadorAtividade/GerenciadorAtividade.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/GerenciadorAtividade.java index d208b10..a25f610 100644 --- a/src/iged/gerenciadorAtividade/GerenciadorAtividade.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/GerenciadorAtividade.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; import java.util.LinkedList; @@ -15,18 +15,18 @@ private GerenciadorAtividade() { portifolio = PortifolioXml.lerXml(); } - public void cadastrar(AtividadeSubjetiva t) { + public void cadastrar(IGEDletSubjetiva t) { portifolio.adicionar(t.getDAO().getMetadado()); PortifolioXml.criarXml(portifolio); - AtividadeXml.criarXml(t); + IGEDletXml.criarXml(t); } - public LinkedList listarTarefas() { + public LinkedList listarTarefas() { return portifolio.getTarefas(); } - public Atividade loadTarefa(MetadadoAtividade mt){ - return AtividadeXml.lerXml(mt); + public IGEDlet loadTarefa(Metadado mt){ + return IGEDletXml.lerXml(mt); } public static GerenciadorAtividade getInstance() { diff --git a/src/iged/gerenciadorAtividade/Atividade.java b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDlet.java similarity index 60% rename from src/iged/gerenciadorAtividade/Atividade.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/IGEDlet.java index fdc7bdc..c31ad82 100644 --- a/src/iged/gerenciadorAtividade/Atividade.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDlet.java @@ -2,30 +2,30 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; import java.util.ArrayList; import java.util.List; import javax.swing.JPanel; -public abstract class Atividade { - AtividadeDAO ativ = null; - List listeners = null; +public abstract class IGEDlet { + IGEDletDAO ativ = null; + List listeners = null; - public Atividade(){ - this.listeners = new ArrayList(); + public IGEDlet(){ + this.listeners = new ArrayList(); } - public void addListener(AtividadeListener l){ + public void addListener(IGEDletListener l){ this.listeners.add(l); } - public void removeListener(AtividadeListener l){ + public void removeListener(IGEDletListener l){ this.listeners.remove(l); } - protected void enviaEventoInicio(final AtividadeEvent e){ - for(final AtividadeListener al : this.listeners){ + protected void enviaEventoInicio(final IGEDletEvent e){ + for(final IGEDletListener al : this.listeners){ new Thread(){ public void run(){ al.atividadeIniciada(e); @@ -34,8 +34,8 @@ public void run(){ } } - protected void enviaEventoResolvido(final AtividadeEvent e){ - for(final AtividadeListener al : this.listeners){ + protected void enviaEventoResolvido(final IGEDletEvent e){ + for(final IGEDletListener al : this.listeners){ new Thread(){ public void run(){ al.atividadeResolvida(e); @@ -44,11 +44,11 @@ public void run(){ } } - public AtividadeDAO getDAO(){ + public IGEDletDAO getDAO(){ return this.ativ; } - public void setDAO(AtividadeDAO a){ + public void setDAO(IGEDletDAO a){ this.ativ = a; } diff --git a/src/iged/gerenciadorAtividade/AtividadeDAO.java b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletDAO.java similarity index 66% rename from src/iged/gerenciadorAtividade/AtividadeDAO.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletDAO.java index dad1a1b..f8f8db0 100644 --- a/src/iged/gerenciadorAtividade/AtividadeDAO.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletDAO.java @@ -2,21 +2,21 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; /** * * @author GILBERTO FARIAS */ -public class AtividadeDAO { - protected MetadadoAtividade metadado; +public class IGEDletDAO { + protected Metadado metadado; protected String descricao; - public MetadadoAtividade getMetadado() { + public Metadado getMetadado() { return metadado; } - public void setMetadado(MetadadoAtividade metadado) { + public void setMetadado(Metadado metadado) { this.metadado = metadado; } diff --git a/src/iged/gerenciadorAtividade/AtividadeEvent.java b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletEvent.java similarity index 75% rename from src/iged/gerenciadorAtividade/AtividadeEvent.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletEvent.java index 95af74e..1cc516f 100644 --- a/src/iged/gerenciadorAtividade/AtividadeEvent.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletEvent.java @@ -2,23 +2,23 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; /** * * @author GILBERTO FARIAS */ -public class AtividadeEvent { +public class IGEDletEvent { int status; - Atividade source; + IGEDlet source; - AtividadeEvent(int status, Atividade a){ + IGEDletEvent(int status, IGEDlet a){ this.status = status; this.source = a; } - public Atividade getSource(){ + public IGEDlet getSource(){ return this.source; } diff --git a/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletListener.java b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletListener.java new file mode 100644 index 0000000..c254ca9 --- /dev/null +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletListener.java @@ -0,0 +1,16 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package br.ufpb.iged.gerenciadorIGEDlet; + +/** + * + * @author GILBERTO FARIAS + */ +public interface IGEDletListener { + + public abstract void atividadeIniciada(IGEDletEvent event); + public abstract void atividadeResolvida(IGEDletEvent event); + +} diff --git a/src/iged/gerenciadorAtividade/AtividadeSubjetiva.java b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetiva.java similarity index 72% rename from src/iged/gerenciadorAtividade/AtividadeSubjetiva.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetiva.java index 1a1878f..6ce8172 100644 --- a/src/iged/gerenciadorAtividade/AtividadeSubjetiva.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetiva.java @@ -2,45 +2,45 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; -import iged.IGEDConst; -import iged.Interpretador; +import br.ufpb.iged.IGEDConst; +import br.ufpb.iged.Interpretador; import java.util.StringTokenizer; import java.util.concurrent.Semaphore; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JPanel; -public class AtividadeSubjetiva extends Atividade{ +public class IGEDletSubjetiva extends IGEDlet{ Interpretador iter = null; Thread exec = null; Semaphore sem = null; - public AtividadeSubjetiva(){ + public IGEDletSubjetiva(){ iter = new Interpretador(); sem = new Semaphore(1, true); } @Override public void inicio() { - //Bloqueia as outras ações na Atividade, enquanto sua Thread n finaliza. + //Bloqueia as outras ações na IGEDlet, enquanto sua Thread n finaliza. try { sem.acquire(); } catch (InterruptedException ex){ } - final AtividadeSubjetiva as = (AtividadeSubjetiva)this; + final IGEDletSubjetiva as = (IGEDletSubjetiva)this; this.exec = new Thread(){ public void run(){ as.iter.setMode(IGEDConst.MODE_BOTH); - String codigo = ((AtividadeSubjetivaDAO)as.ativ).getCodInicializacao(); + String codigo = ((IGEDletSubjetivaDAO)as.ativ).getCodInicializacao(); as.execute(codigo); - as.enviaEventoInicio(new AtividadeEvent(AtividadeEvent.INIT, as)); + as.enviaEventoInicio(new IGEDletEvent(IGEDletEvent.INIT, as)); as.iter.setMode(IGEDConst.MODE_PROFESSOR); - codigo = ((AtividadeSubjetivaDAO)as.ativ).getCodSolucao(); + codigo = ((IGEDletSubjetivaDAO)as.ativ).getCodSolucao(); as.execute(codigo); as.iter.setMode(IGEDConst.MODE_STUDENT); @@ -61,22 +61,22 @@ private void execute(String cod) { @Override public void resolve(final String response) { - //Bloqueia as outras ações na Atividade, enquanto sua Thread n finaliza. + //Bloqueia as outras ações na IGEDlet, enquanto sua Thread n finaliza. try { sem.acquire(); } catch (InterruptedException ex){ } - final AtividadeSubjetiva as = (AtividadeSubjetiva)this; + final IGEDletSubjetiva as = (IGEDletSubjetiva)this; this.exec = new Thread(){ public void run(){ as.execute(response); - AtividadeEvent e; + IGEDletEvent e; if(as.estaCorreta()){ - e = new AtividadeEvent(AtividadeEvent.SUCCESS, as); + e = new IGEDletEvent(IGEDletEvent.SUCCESS, as); }else{ - e = new AtividadeEvent(AtividadeEvent.FAIL, as); + e = new IGEDletEvent(IGEDletEvent.FAIL, as); } as.enviaEventoResolvido(e); diff --git a/src/iged/gerenciadorAtividade/AtividadeSubjetivaDAO.java b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetivaDAO.java similarity index 86% rename from src/iged/gerenciadorAtividade/AtividadeSubjetivaDAO.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetivaDAO.java index f0dd00b..c497da9 100644 --- a/src/iged/gerenciadorAtividade/AtividadeSubjetivaDAO.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletSubjetivaDAO.java @@ -2,13 +2,13 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; /** * * @author GILBERTO FARIAS */ -public class AtividadeSubjetivaDAO extends AtividadeDAO{ +public class IGEDletSubjetivaDAO extends IGEDletDAO{ private String codInicializacao; private String codSolucao; diff --git a/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletXml.java b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletXml.java new file mode 100644 index 0000000..34af0c6 --- /dev/null +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/IGEDletXml.java @@ -0,0 +1,63 @@ + +package br.ufpb.iged.gerenciadorIGEDlet; + +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.DomDriver; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; + +/** + * + * @author Dorgi + */ +public class IGEDletXml { + + private static Metadado atividade; + public static final File raiz = new File("./Tarefas"); + + public static void criarXml(IGEDletSubjetiva atividade) { + XStream xstream = new XStream(new DomDriver()); + + xstream.alias("atividade", IGEDletSubjetiva.class); + xstream.alias("metadados", Metadado.class); + + String xmlTutorial = xstream.toXML(atividade); + System.out.println(xmlTutorial); + XmlPersistencia.salvarXml(xmlTutorial, "tarefa" + atividade.getDAO().getMetadado().getId() + ".xml"); + } + + static IGEDletSubjetiva lerXmlSubjetiva(int id) { + XStream x = new XStream(new DomDriver()); + //MetadadoTarefa metadado = new Metadado(); + try { + // carrega o arquivo XML + FileInputStream input = new FileInputStream(new File(XmlPersistencia.DIRTAREFAS + "tarefa" + id + ".xml")); + // informa o nome do nó raiz do xml + x.alias("atividade", IGEDletSubjetivaDAO.class); + x.alias("metadados", Metadado.class); + // cria um objeto da classe, contendo os dados lidos no xml + IGEDletSubjetivaDAO dao = (IGEDletSubjetivaDAO) x.fromXML(input); + IGEDletSubjetiva as = new IGEDletSubjetiva(); + as.setDAO(dao); + + return as; + + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + public static IGEDlet lerXml(Metadado mt) { + if(mt.getType() == IGEDlet.SUBJETIVA) + return IGEDletXml.lerXmlSubjetiva(mt.getId()); + else + return null; + } + +} + diff --git a/src/iged/gerenciadorAtividade/MetadadoAtividade.java b/src/br/ufpb/iged/gerenciadorIGEDlet/Metadado.java similarity index 89% rename from src/iged/gerenciadorAtividade/MetadadoAtividade.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/Metadado.java index 946038b..c33e560 100644 --- a/src/iged/gerenciadorAtividade/MetadadoAtividade.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/Metadado.java @@ -2,13 +2,13 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; /** * * @author Dorgi */ -public class MetadadoAtividade { +public class Metadado { String area; String autor; @@ -17,7 +17,7 @@ public class MetadadoAtividade { int type; - public MetadadoAtividade(){ + public Metadado(){ } diff --git a/src/iged/gerenciadorTarefa/Portifolio.java b/src/br/ufpb/iged/gerenciadorIGEDlet/Portifolio.java similarity index 61% rename from src/iged/gerenciadorTarefa/Portifolio.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/Portifolio.java index f59e13b..bcc691c 100644 --- a/src/iged/gerenciadorTarefa/Portifolio.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/Portifolio.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorTarefa; +package br.ufpb.iged.gerenciadorIGEDlet; import java.util.LinkedList; @@ -12,22 +12,22 @@ */ public class Portifolio { - LinkedList tarefas; + LinkedList tarefas; int cont=0; public Portifolio(){ - tarefas = new LinkedList(); + tarefas = new LinkedList(); } - public LinkedList getTarefas() { + public LinkedList getTarefas() { return tarefas; } - public void setTarefas(LinkedList tarefas) { + public void setTarefas(LinkedList tarefas) { this.tarefas = tarefas; } - public void adicionar(MetadadoTarefa m){ + public void adicionar(Metadado m){ m.setId(cont); tarefas.add(m); cont++; diff --git a/src/iged/gerenciadorTarefa/PortifolioXml.java b/src/br/ufpb/iged/gerenciadorIGEDlet/PortifolioXml.java similarity index 84% rename from src/iged/gerenciadorTarefa/PortifolioXml.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/PortifolioXml.java index 2aea916..6888005 100644 --- a/src/iged/gerenciadorTarefa/PortifolioXml.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/PortifolioXml.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorTarefa; +package br.ufpb.iged.gerenciadorIGEDlet; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; @@ -22,7 +22,7 @@ public static void criarXml(Portifolio portifolio) { XStream xstream = new XStream(new DomDriver()); xstream.alias("portifolio", Portifolio.class); - xstream.alias("metadados", MetadadoTarefa.class); + xstream.alias("metadados", Metadado.class); String xmlTutorial = xstream.toXML(portifolio); System.out.println(xmlTutorial); @@ -32,20 +32,20 @@ public static void criarXml(Portifolio portifolio) { public static Portifolio lerXml() { XStream x = new XStream(new DomDriver()); - //MetadadoTarefa metadado = new MetadadoTarefa(); + //MetadadoTarefa metadado = new Metadado(); try { // carrega o arquivo XML FileInputStream input = new FileInputStream(new File(XmlPersistencia.DIRTAREFAS+"tarefas.xml")); // informa o nome do nó raiz do xml x.alias("portifolio", Portifolio.class); - x.alias("metadados", MetadadoTarefa.class); + x.alias("metadados", Metadado.class); // cria um objeto da classe, contendo os dados lidos no xml Portifolio pf = (Portifolio) x.fromXML(input); if (pf.getTarefas()==null){ - pf.setTarefas(new LinkedList()) ; + pf.setTarefas(new LinkedList()) ; } - for (MetadadoTarefa mt : pf.getTarefas()){ + for (Metadado mt : pf.getTarefas()){ System.out.println("Portifolio"); System.out.println("Área: "+mt.getArea()); System.out.println("Autor: "+mt.getAutor()); diff --git a/src/iged/gerenciadorTarefa/Xml.java b/src/br/ufpb/iged/gerenciadorIGEDlet/Xml.java similarity index 81% rename from src/iged/gerenciadorTarefa/Xml.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/Xml.java index 2797ad1..52d6c81 100644 --- a/src/iged/gerenciadorTarefa/Xml.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/Xml.java @@ -2,13 +2,13 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorTarefa; +package br.ufpb.iged.gerenciadorIGEDlet; -import iged.gui.ConversorXmlTutorial; -import iged.gui.DiretorioExistenteException; -import iged.gui.TelaCadastroDeTutorialInterno; -import iged.gui.gerenciador.ConversorXmlTarefa; -import iged.gui.TelaCadastroDeTarefaInterno; +import br.ufpb.iged.gui.ConversorXmlTutorial; +import br.ufpb.iged.gui.DiretorioExistenteException; +import br.ufpb.iged.gui.TelaCadastroDeTutorialInterno; +import br.ufpb.iged.gui.gerenciador.ConversorXmlTarefa; +import br.ufpb.iged.gui.TelaCadastroDeTarefaInterno; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/src/iged/gerenciadorAtividade/XmlPersistencia.java b/src/br/ufpb/iged/gerenciadorIGEDlet/XmlPersistencia.java similarity index 94% rename from src/iged/gerenciadorAtividade/XmlPersistencia.java rename to src/br/ufpb/iged/gerenciadorIGEDlet/XmlPersistencia.java index be3dfcf..b0e2cbf 100644 --- a/src/iged/gerenciadorAtividade/XmlPersistencia.java +++ b/src/br/ufpb/iged/gerenciadorIGEDlet/XmlPersistencia.java @@ -2,11 +2,11 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.gerenciadorAtividade; +package br.ufpb.iged.gerenciadorIGEDlet; -import iged.gui.gerenciador.ConversorXmlTarefa; -import iged.gui.gerenciador.PortifolioXml; -import iged.gui.TelaCadastroDeTarefaInterno; +import br.ufpb.iged.gui.gerenciador.ConversorXmlTarefa; +import br.ufpb.iged.gui.gerenciador.PortifolioXml; +import br.ufpb.iged.gui.TelaCadastroDeTarefaInterno; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; diff --git a/src/iged/grafico/geometria/Circulo.java b/src/br/ufpb/iged/grafico/geometria/Circulo.java similarity index 91% rename from src/iged/grafico/geometria/Circulo.java rename to src/br/ufpb/iged/grafico/geometria/Circulo.java index c8b6c54..30598b3 100644 --- a/src/iged/grafico/geometria/Circulo.java +++ b/src/br/ufpb/iged/grafico/geometria/Circulo.java @@ -1,41 +1,41 @@ -package iged.grafico.geometria; - -import java.awt.geom.Point2D; - -public class Circulo extends Poligono{ - private Point2D pcenter = null; - private int radius = 0; - - public Circulo(Point2D pc, int r){ - this.pcenter = pc; - this.radius = r; - - this.createCirclePoints(); - } - - private void createCirclePoints(){ - for (int a = 0 ; a < 361 ; a++ ) { - double aRad = a*(Math.PI/180); - double x = pcenter.getX() + (this.radius * Math.cos(aRad)); - double y = pcenter.getY() + (this.radius * Math.sin(aRad)); - - this.add(new Point2D.Double(x, y)); - } - } - - public void mover(int dx, int dy, int t){ - pcenter.setLocation(pcenter.getX() + dx, pcenter.getY() + dy); - - //super.mover(dx, dy, t); - } - - public void zoom(double z){ - if(z < 0) - return; - - this.points.clear(); - this.radius *= z; - - this.createCirclePoints(); - } +package br.ufpb.iged.grafico.geometria; + +import java.awt.geom.Point2D; + +public class Circulo extends Poligono{ + private Point2D pcenter = null; + private int radius = 0; + + public Circulo(Point2D pc, int r){ + this.pcenter = pc; + this.radius = r; + + this.createCirclePoints(); + } + + private void createCirclePoints(){ + for (int a = 0 ; a < 361 ; a++ ) { + double aRad = a*(Math.PI/180); + double x = pcenter.getX() + (this.radius * Math.cos(aRad)); + double y = pcenter.getY() + (this.radius * Math.sin(aRad)); + + this.add(new Point2D.Double(x, y)); + } + } + + public void mover(int dx, int dy, int t){ + pcenter.setLocation(pcenter.getX() + dx, pcenter.getY() + dy); + + //super.mover(dx, dy, t); + } + + public void zoom(double z){ + if(z < 0) + return; + + this.points.clear(); + this.radius *= z; + + this.createCirclePoints(); + } } \ No newline at end of file diff --git a/src/iged/grafico/geometria/Label.java b/src/br/ufpb/iged/grafico/geometria/Label.java similarity index 90% rename from src/iged/grafico/geometria/Label.java rename to src/br/ufpb/iged/grafico/geometria/Label.java index e4b109c..fa0a413 100644 --- a/src/iged/grafico/geometria/Label.java +++ b/src/br/ufpb/iged/grafico/geometria/Label.java @@ -1,46 +1,46 @@ -package iged.grafico.geometria; - -import java.awt.geom.Point2D; -import java.awt.*; - -public class Label{ - private String text = null; - private Font font = null; - private Point2D pb = null; - - public Label(String t, Point2D p){ - this.text = t; - this.pb = p; - this.setFont(new Font("Serif", Font.PLAIN, 20)); - } - - public void setText(String t){ - this.text = t; - } - - public String getText(){ - return this.text; - } - - public void setFont(Font f){ - this.font = f; - } - - public Font getFont(){ - return this.font; - } - - public Point2D getPoint(){ - return this.pb; - } - - - - public void setPoint(Point2D p){ - this.pb = p; - } - - public void mover(double dx, double dy) { - this.pb.setLocation(pb.getX() + dx, pb.getY() + dy); - } +package br.ufpb.iged.grafico.geometria; + +import java.awt.geom.Point2D; +import java.awt.*; + +public class Label{ + private String text = null; + private Font font = null; + private Point2D pb = null; + + public Label(String t, Point2D p){ + this.text = t; + this.pb = p; + this.setFont(new Font("Serif", Font.PLAIN, 20)); + } + + public void setText(String t){ + this.text = t; + } + + public String getText(){ + return this.text; + } + + public void setFont(Font f){ + this.font = f; + } + + public Font getFont(){ + return this.font; + } + + public Point2D getPoint(){ + return this.pb; + } + + + + public void setPoint(Point2D p){ + this.pb = p; + } + + public void mover(double dx, double dy) { + this.pb.setLocation(pb.getX() + dx, pb.getY() + dy); + } } \ No newline at end of file diff --git a/src/iged/grafico/geometria/Poligono.java b/src/br/ufpb/iged/grafico/geometria/Poligono.java similarity index 89% rename from src/iged/grafico/geometria/Poligono.java rename to src/br/ufpb/iged/grafico/geometria/Poligono.java index 45c5e9d..c945e0f 100644 --- a/src/iged/grafico/geometria/Poligono.java +++ b/src/br/ufpb/iged/grafico/geometria/Poligono.java @@ -1,65 +1,65 @@ -package iged.grafico.geometria; - -import iged.grafico.manager.Quadro; -import iged.grafico.manager.PoligonoGrafico; -import java.awt.geom.Point2D; -import java.awt.Color; - -public class Poligono extends PoligonoGrafico { - - //Adiciona um vertice do poligono - public void add(Point2D p) { - this.points.add(p); - } - - public void mover(double dx, double dy) { - for (Point2D p : points) { - p.setLocation(p.getX() + dx, p.getY() + dy); - } - } - - public void evidencia(final Color cor, final float st, final Quadro quadro) { - final Poligono p = this; - //new Thread() { - - //public void run() { - Color caux = p.getStrokeColor(); - float staux = p.getStroke(); - p.setStrokeColor(cor); - p.setStroke(st); - quadro.atualizar(); - - try { - Thread.sleep(300); - } catch (Exception e) { - } - - p.setStrokeColor(caux); - p.setStroke(staux); - quadro.atualizar(); - - //} - //}.start(); - } - - public void zoom(double z) { - if (z < 0) { - return; - } - - Point2D pbase = points.get(0); - - for (int i = 1; i < points.size(); ++i) { - Point2D p = points.get(i); - double dx = 0; - double dy = 0; - if (pbase.getX() != p.getX()) { - dx = (p.getX() - pbase.getX()) * z; - } - if (pbase.getY() != p.getY()) { - dy = (p.getY() - pbase.getY()) * z; - } - p.setLocation(p.getX() + dx, p.getY() + dy); - } - } +package br.ufpb.iged.grafico.geometria; + +import br.ufpb.iged.grafico.manager.Quadro; +import br.ufpb.iged.grafico.manager.PoligonoGrafico; +import java.awt.geom.Point2D; +import java.awt.Color; + +public class Poligono extends PoligonoGrafico { + + //Adiciona um vertice do poligono + public void add(Point2D p) { + this.points.add(p); + } + + public void mover(double dx, double dy) { + for (Point2D p : points) { + p.setLocation(p.getX() + dx, p.getY() + dy); + } + } + + public void evidencia(final Color cor, final float st, final Quadro quadro) { + final Poligono p = this; + //new Thread() { + + //public void run() { + Color caux = p.getStrokeColor(); + float staux = p.getStroke(); + p.setStrokeColor(cor); + p.setStroke(st); + quadro.atualizar(); + + try { + Thread.sleep(300); + } catch (Exception e) { + } + + p.setStrokeColor(caux); + p.setStroke(staux); + quadro.atualizar(); + + //} + //}.start(); + } + + public void zoom(double z) { + if (z < 0) { + return; + } + + Point2D pbase = points.get(0); + + for (int i = 1; i < points.size(); ++i) { + Point2D p = points.get(i); + double dx = 0; + double dy = 0; + if (pbase.getX() != p.getX()) { + dx = (p.getX() - pbase.getX()) * z; + } + if (pbase.getY() != p.getY()) { + dy = (p.getY() - pbase.getY()) * z; + } + p.setLocation(p.getX() + dx, p.getY() + dy); + } + } } \ No newline at end of file diff --git a/src/iged/grafico/geometria/Retangulo.java b/src/br/ufpb/iged/grafico/geometria/Retangulo.java similarity index 89% rename from src/iged/grafico/geometria/Retangulo.java rename to src/br/ufpb/iged/grafico/geometria/Retangulo.java index c62c306..d1d7fb4 100644 --- a/src/iged/grafico/geometria/Retangulo.java +++ b/src/br/ufpb/iged/grafico/geometria/Retangulo.java @@ -1,23 +1,23 @@ -package iged.grafico.geometria; - -import java.awt.geom.Point2D; -import java.awt.Color; - -public class Retangulo extends Poligono{ - public int width = 0; - public int height = 0; - - public Retangulo(Point2D pbase, int w, int h){ - this.width = w; - this.height = h; - - double xb = (int)pbase.getX(); - double yb = (int)pbase.getY(); - - this.add(pbase); - this.add(new Point2D.Double(xb + w, yb)); - this.add(new Point2D.Double(xb + w, yb + h)); - this.add(new Point2D.Double(xb, yb + h)); - - } +package br.ufpb.iged.grafico.geometria; + +import java.awt.geom.Point2D; +import java.awt.Color; + +public class Retangulo extends Poligono{ + public int width = 0; + public int height = 0; + + public Retangulo(Point2D pbase, int w, int h){ + this.width = w; + this.height = h; + + double xb = (int)pbase.getX(); + double yb = (int)pbase.getY(); + + this.add(pbase); + this.add(new Point2D.Double(xb + w, yb)); + this.add(new Point2D.Double(xb + w, yb + h)); + this.add(new Point2D.Double(xb, yb + h)); + + } } \ No newline at end of file diff --git a/src/iged/grafico/manager/AcaoUsuario.java b/src/br/ufpb/iged/grafico/manager/AcaoUsuario.java similarity index 83% rename from src/iged/grafico/manager/AcaoUsuario.java rename to src/br/ufpb/iged/grafico/manager/AcaoUsuario.java index 19664ea..c2a74da 100644 --- a/src/iged/grafico/manager/AcaoUsuario.java +++ b/src/br/ufpb/iged/grafico/manager/AcaoUsuario.java @@ -1,10 +1,10 @@ -package iged.grafico.manager; - -public interface AcaoUsuario{ - public abstract void init(); - public abstract void color(); - public abstract void move(); - public abstract void zoom(); - public abstract Quadro getQuadro(); - +package br.ufpb.iged.grafico.manager; + +public interface AcaoUsuario{ + public abstract void init(); + public abstract void color(); + public abstract void move(); + public abstract void zoom(); + public abstract Quadro getQuadro(); + } \ No newline at end of file diff --git a/src/iged/grafico/manager/Desenhavel.java b/src/br/ufpb/iged/grafico/manager/Desenhavel.java similarity index 79% rename from src/iged/grafico/manager/Desenhavel.java rename to src/br/ufpb/iged/grafico/manager/Desenhavel.java index 82b227f..3481d28 100644 --- a/src/iged/grafico/manager/Desenhavel.java +++ b/src/br/ufpb/iged/grafico/manager/Desenhavel.java @@ -1,4 +1,4 @@ -package iged.grafico.manager; +package br.ufpb.iged.grafico.manager; import java.awt.Graphics; diff --git a/src/iged/grafico/manager/ExitListener.java b/src/br/ufpb/iged/grafico/manager/ExitListener.java similarity index 89% rename from src/iged/grafico/manager/ExitListener.java rename to src/br/ufpb/iged/grafico/manager/ExitListener.java index 96fc234..0961406 100644 --- a/src/iged/grafico/manager/ExitListener.java +++ b/src/br/ufpb/iged/grafico/manager/ExitListener.java @@ -1,15 +1,15 @@ -package iged.grafico.manager; - -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -/** A listener that you attach to the top-level Frame or JFrame of - * your application, so quitting the frame exits the application. - * 1998 Marty Hall, http://www.apl.jhu.edu/~hall/java/ - */ - -public class ExitListener extends WindowAdapter { - public void windowClosing(WindowEvent event) { - System.exit(0); - } +package br.ufpb.iged.grafico.manager; + +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +/** A listener that you attach to the top-level Frame or JFrame of + * your application, so quitting the frame exits the application. + * 1998 Marty Hall, http://www.apl.jhu.edu/~hall/java/ + */ + +public class ExitListener extends WindowAdapter { + public void windowClosing(WindowEvent event) { + System.exit(0); + } } \ No newline at end of file diff --git a/src/iged/grafico/manager/GraphicManager.java b/src/br/ufpb/iged/grafico/manager/GraphicManager.java similarity index 96% rename from src/iged/grafico/manager/GraphicManager.java rename to src/br/ufpb/iged/grafico/manager/GraphicManager.java index e3c5cd5..f753fd3 100644 --- a/src/iged/grafico/manager/GraphicManager.java +++ b/src/br/ufpb/iged/grafico/manager/GraphicManager.java @@ -1,13 +1,13 @@ -package iged.grafico.manager; - -import iged.IGEDConst; -import iged.grafico.struct.BinaryTree; -import iged.grafico.struct.Vetor; -import iged.grafico.struct.LinkedList; -import iged.grafico.struct.LinkedListNode; -import iged.grafico.struct.NodeTree; -import iged.grafico.struct.Struct; -import iged.grafico.struct.WrapperStruct; +package br.ufpb.iged.grafico.manager; + +import br.ufpb.iged.IGEDConst; +import br.ufpb.iged.grafico.struct.BinaryTree; +import br.ufpb.iged.grafico.struct.Vetor; +import br.ufpb.iged.grafico.struct.LinkedList; +import br.ufpb.iged.grafico.struct.LinkedListNode; +import br.ufpb.iged.grafico.struct.NodeTree; +import br.ufpb.iged.grafico.struct.Struct; +import br.ufpb.iged.grafico.struct.WrapperStruct; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collections; diff --git a/src/iged/grafico/manager/PaintManager.java b/src/br/ufpb/iged/grafico/manager/PaintManager.java similarity index 86% rename from src/iged/grafico/manager/PaintManager.java rename to src/br/ufpb/iged/grafico/manager/PaintManager.java index cad6599..1d19b8d 100644 --- a/src/iged/grafico/manager/PaintManager.java +++ b/src/br/ufpb/iged/grafico/manager/PaintManager.java @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package iged.grafico.manager; +package br.ufpb.iged.grafico.manager; /** * diff --git a/src/iged/grafico/manager/PaintUI.java b/src/br/ufpb/iged/grafico/manager/PaintUI.java similarity index 95% rename from src/iged/grafico/manager/PaintUI.java rename to src/br/ufpb/iged/grafico/manager/PaintUI.java index d8860eb..1632957 100644 --- a/src/iged/grafico/manager/PaintUI.java +++ b/src/br/ufpb/iged/grafico/manager/PaintUI.java @@ -1,120 +1,120 @@ -package iged.grafico.manager; - -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Container; -import java.awt.FlowLayout; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.StringTokenizer; - -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JTextArea; -import javax.swing.JTextPane; - -public class PaintUI extends JFrame { - /** - * - */ - private static final long serialVersionUID = 604149682055649395L; - javax.swing.JScrollPane scroll; - javax.swing.JScrollPane scroll2; - javax.swing.JTextArea text; - - - public JButton colorB = new JButton("", new ImageIcon("icons/exe.png")); - //public JButton moveB = new JButton("Mover", new ImageIcon("icons/move.png")); - //public JButton zoomB = new JButton("Zoom", new ImageIcon("icons/zoom.png")); - - public PaintUI(String nome, final AcaoUsuario paint) { - super(nome); - Container framePane = this.getContentPane(); - framePane.setLayout(new BorderLayout()); - - //framePane.setLayout(null); - //JPanel exec = new JPanel(); - //exec.setBackground(Color.LIGHT_GRAY); - //exec.setLayout(null); - - //JPanel botao = new JPanel(); - //botao.setLayout(null); - //botoes.setLayout(new GridLayout(3,1)); - - //colorB.setBounds(10, 10, 50, 30); - //botao.add(colorB); - //botoes.add(moveB); - //botoes.add(zoomB); - - //JTextArea tp = new JTextArea(); - //exec.add(tp); - //exec.add(botao); - Container c = paint.getQuadro(); - c.setBackground(Color.white); - c.setLayout(null); - - colorB.setBounds(690, 490, 60, 60); - //colorB.setLocation(650, 450); - - //c.add(colorB); - - text = new javax.swing.JTextArea(); - scroll = new javax.swing.JScrollPane(); - scroll2 = new javax.swing.JScrollPane(); - - text.setColumns(10); - text.setRows(5); - scroll2.setViewportView(text); - scroll.setViewportView(c); - - framePane.add(scroll,BorderLayout.CENTER); - - framePane.add(scroll2,BorderLayout.SOUTH); - this.setSize(1024,768); - this.addWindowListener(new ExitListener()); - this.setVisible(true); - - c.add(colorB);// Tirar essa linha, � somente para teste - colorB.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - paint.color(); - } - }); - - /*moveB.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - paint.move(); - } - }); - - zoomB.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - paint.zoom(); - } - });*/ - } - - public StringTokenizer lastLine(){ - - StringTokenizer st = new StringTokenizer(text.getText()); - StringTokenizer last = null; - while(st.hasMoreTokens()){ - last = new StringTokenizer(st.nextToken("\n")); - } - return last; - } - - public String Lines(){ - return text.getText(); - } - - public javax.swing.JTextArea getTextArea(){ - return text; - } - - - +package br.ufpb.iged.grafico.manager; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Container; +import java.awt.FlowLayout; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.StringTokenizer; + +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.JTextPane; + +public class PaintUI extends JFrame { + /** + * + */ + private static final long serialVersionUID = 604149682055649395L; + javax.swing.JScrollPane scroll; + javax.swing.JScrollPane scroll2; + javax.swing.JTextArea text; + + + public JButton colorB = new JButton("", new ImageIcon("icons/exe.png")); + //public JButton moveB = new JButton("Mover", new ImageIcon("icons/move.png")); + //public JButton zoomB = new JButton("Zoom", new ImageIcon("icons/zoom.png")); + + public PaintUI(String nome, final AcaoUsuario paint) { + super(nome); + Container framePane = this.getContentPane(); + framePane.setLayout(new BorderLayout()); + + //framePane.setLayout(null); + //JPanel exec = new JPanel(); + //exec.setBackground(Color.LIGHT_GRAY); + //exec.setLayout(null); + + //JPanel botao = new JPanel(); + //botao.setLayout(null); + //botoes.setLayout(new GridLayout(3,1)); + + //colorB.setBounds(10, 10, 50, 30); + //botao.add(colorB); + //botoes.add(moveB); + //botoes.add(zoomB); + + //JTextArea tp = new JTextArea(); + //exec.add(tp); + //exec.add(botao); + Container c = paint.getQuadro(); + c.setBackground(Color.white); + c.setLayout(null); + + colorB.setBounds(690, 490, 60, 60); + //colorB.setLocation(650, 450); + + //c.add(colorB); + + text = new javax.swing.JTextArea(); + scroll = new javax.swing.JScrollPane(); + scroll2 = new javax.swing.JScrollPane(); + + text.setColumns(10); + text.setRows(5); + scroll2.setViewportView(text); + scroll.setViewportView(c); + + framePane.add(scroll,BorderLayout.CENTER); + + framePane.add(scroll2,BorderLayout.SOUTH); + this.setSize(1024,768); + this.addWindowListener(new ExitListener()); + this.setVisible(true); + + c.add(colorB);// Tirar essa linha, � somente para teste + colorB.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + paint.color(); + } + }); + + /*moveB.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + paint.move(); + } + }); + + zoomB.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + paint.zoom(); + } + });*/ + } + + public StringTokenizer lastLine(){ + + StringTokenizer st = new StringTokenizer(text.getText()); + StringTokenizer last = null; + while(st.hasMoreTokens()){ + last = new StringTokenizer(st.nextToken("\n")); + } + return last; + } + + public String Lines(){ + return text.getText(); + } + + public javax.swing.JTextArea getTextArea(){ + return text; + } + + + } \ No newline at end of file diff --git a/src/iged/grafico/manager/PoligonoGrafico.java b/src/br/ufpb/iged/grafico/manager/PoligonoGrafico.java similarity index 95% rename from src/iged/grafico/manager/PoligonoGrafico.java rename to src/br/ufpb/iged/grafico/manager/PoligonoGrafico.java index ff8558b..e796f96 100644 --- a/src/iged/grafico/manager/PoligonoGrafico.java +++ b/src/br/ufpb/iged/grafico/manager/PoligonoGrafico.java @@ -1,120 +1,120 @@ -package iged.grafico.manager; - -import java.awt.Color; -import java.awt.geom.CubicCurve2D; -import java.awt.geom.GeneralPath; -import java.awt.geom.Path2D; -import java.util.LinkedList; -import java.awt.geom.Point2D; - -public class PoligonoGrafico{ - - public static final int LINEAR = 0; - public static final int CURVE = 1; - - protected java.util.List points = null; - protected Color color = Color.white; - protected float stroke = 2; - protected Color strokeColor = Color.black; - - int type; - - public PoligonoGrafico(){ - this.points = new LinkedList(); - type = LINEAR; - } - - //adiciona um poligono já constuido - public void setType(int t){ - this.type = t; - } - - //Adiciona um vertice do poligono - public void add(Point2D p){ - this.points.add(p); - } - - //Adciona todos os pontos da List - public void addAll(java.util.List ps){ - this.points.addAll(ps); - } - - //Limpa todos os pontos do desenho. - public void clearPoints(){ - this.points.clear(); - } - - public Color getColor(){ - return this.color; - } - public void setColor(Color c){ - this.color = c; - } - - public Color getStrokeColor(){ - return this.strokeColor; - } - public void setStrokeColor(Color c){ - this.strokeColor = c; - } - - public float getStroke(){ - return this.stroke; - } - public void setStroke(float st){ - this.stroke = st; - } - - public Object getPrint(){ - if(type == LINEAR){ - GeneralPath polygon = new GeneralPath(GeneralPath.WIND_EVEN_ODD, - this.points.size()); - - Point2D pto = this.points.get(0); - polygon.moveTo(pto.getX(), pto.getY()); - for ( int index = 1; index < this.points.size(); index++ ) { - pto = this.points.get(index); - polygon.lineTo(pto.getX(), pto.getY()); - } - - polygon.closePath(); - return polygon; - }else{ - - CubicCurve2D c = new CubicCurve2D.Double(); - // Define suas coordenadas e a desenha - - Point2D p0 = this.points.get(0); - Point2D p1 = this.points.get(1); - Point2D p2 = this.points.get(2); - Point2D p3 = this.points.get(3); - - c.setCurve(p0.getX(), p0.getY(), p1.getX(), p1.getY(), - p2.getX(), p2.getY(), p3.getX(), p3.getY()); - - return c; - - /*polygon = new GeneralPath(GeneralPath.WIND_EVEN_ODD, 3); - - Point2D pto = this.points.get(0); - polygon.moveTo(pto.getX(), pto.getY()); - pto = this.points.get(1); - polygon.lineTo(pto.getX(), pto.getY()); - - - - polygon.curveTo(p1.getX(), p1.getY(), - p2.getX(), p2.getY(), - p3.getX(), p3.getY()); - */ - //polygon - } - - //return polygon; - } - - public Point2D getBasePoint(){ - return this.points.get(0); - } - +package br.ufpb.iged.grafico.manager; + +import java.awt.Color; +import java.awt.geom.CubicCurve2D; +import java.awt.geom.GeneralPath; +import java.awt.geom.Path2D; +import java.util.LinkedList; +import java.awt.geom.Point2D; + +public class PoligonoGrafico{ + + public static final int LINEAR = 0; + public static final int CURVE = 1; + + protected java.util.List points = null; + protected Color color = Color.white; + protected float stroke = 2; + protected Color strokeColor = Color.black; + + int type; + + public PoligonoGrafico(){ + this.points = new LinkedList(); + type = LINEAR; + } + + //adiciona um poligono já constuido + public void setType(int t){ + this.type = t; + } + + //Adiciona um vertice do poligono + public void add(Point2D p){ + this.points.add(p); + } + + //Adciona todos os pontos da List + public void addAll(java.util.List ps){ + this.points.addAll(ps); + } + + //Limpa todos os pontos do desenho. + public void clearPoints(){ + this.points.clear(); + } + + public Color getColor(){ + return this.color; + } + public void setColor(Color c){ + this.color = c; + } + + public Color getStrokeColor(){ + return this.strokeColor; + } + public void setStrokeColor(Color c){ + this.strokeColor = c; + } + + public float getStroke(){ + return this.stroke; + } + public void setStroke(float st){ + this.stroke = st; + } + + public Object getPrint(){ + if(type == LINEAR){ + GeneralPath polygon = new GeneralPath(GeneralPath.WIND_EVEN_ODD, + this.points.size()); + + Point2D pto = this.points.get(0); + polygon.moveTo(pto.getX(), pto.getY()); + for ( int index = 1; index < this.points.size(); index++ ) { + pto = this.points.get(index); + polygon.lineTo(pto.getX(), pto.getY()); + } + + polygon.closePath(); + return polygon; + }else{ + + CubicCurve2D c = new CubicCurve2D.Double(); + // Define suas coordenadas e a desenha + + Point2D p0 = this.points.get(0); + Point2D p1 = this.points.get(1); + Point2D p2 = this.points.get(2); + Point2D p3 = this.points.get(3); + + c.setCurve(p0.getX(), p0.getY(), p1.getX(), p1.getY(), + p2.getX(), p2.getY(), p3.getX(), p3.getY()); + + return c; + + /*polygon = new GeneralPath(GeneralPath.WIND_EVEN_ODD, 3); + + Point2D pto = this.points.get(0); + polygon.moveTo(pto.getX(), pto.getY()); + pto = this.points.get(1); + polygon.lineTo(pto.getX(), pto.getY()); + + + + polygon.curveTo(p1.getX(), p1.getY(), + p2.getX(), p2.getY(), + p3.getX(), p3.getY()); + */ + //polygon + } + + //return polygon; + } + + public Point2D getBasePoint(){ + return this.points.get(0); + } + } \ No newline at end of file diff --git a/src/iged/grafico/manager/Quadro.java b/src/br/ufpb/iged/grafico/manager/Quadro.java similarity index 92% rename from src/iged/grafico/manager/Quadro.java rename to src/br/ufpb/iged/grafico/manager/Quadro.java index a9007b4..610ba9c 100644 --- a/src/iged/grafico/manager/Quadro.java +++ b/src/br/ufpb/iged/grafico/manager/Quadro.java @@ -1,156 +1,156 @@ -package iged.grafico.manager; - -import iged.grafico.struct.Elemento; -import iged.grafico.geometria.Poligono; -import iged.grafico.geometria.Label; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Shape; -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Font; -import java.awt.geom.Point2D; -import java.util.*; - - -import javax.swing.JPanel; - -public class Quadro extends JPanel { - - private java.util.List desenhaveis = null; - private java.util.List