/ - Diff - | gvSIG desktop 1 - gvSIG

     package org.gvsig.gui.beans.incrementableTask;
     import org.gvsig.gui.beans.IncrementableTask.IIncrementable;
     import org.gvsig.gui.beans.IncrementableTask.IncrementableTask;
     public class TestIncrementableTask {
     	class ClassProcess implements IIncrementable {
     		int i = 0;
     		public String getLabel() {
     			return "Etiqueta " + i;
+    		}
     		public String getLog() {
     			return "Mi log " + i;
+    		}
     		public int getPercent() {
     			i++;
     			return i/10;
+    		}
     		public String getTitle() {
     			return "TestIncrementTask";
+    		}
+    	}
       ClassProcess ncp = new ClassProcess();
     	public TestIncrementableTask() {
     		super();
     		initialize();
+    	}
     	private void initialize() {
     		IncrementableTask it = new IncrementableTask(ncp);
     		it.showWindow();
+    	}
     	public static void main(String[] args) {
     		new TestIncrementableTask();
+    	}
+    }

     import javax.swing.UIManager;
     import org.gvsig.gui.beans.buttonsPanel.ButtonsPanel;
     import org.gvsig.gui.beans.defaultButtonsPanel.DefaultButtonsPanel;
     /**
      * <code>TestDialogPanel</code>. Test para comprobar el funcionamiento de la
      * clase <code>DialogPanel</code>
-...
     public class TestDialogPanel implements ActionListener {
     	private JFrame frame = new JFrame();
     	class NewComponentDialog extends DialogPanel {
     	class NewComponentDialog extends DefaultButtonsPanel {
     		private static final long serialVersionUID = 4452922507292538671L;
     		public NewComponentDialog() {

trunk/libraries/libUIComponent/src-test/org/gvsig/gui/beans/progressPanel/TestProgressPanel.java
31	31	* @author Borja Sanchez Zamorano (borja.sanchez@iver.es)
32	32	*/
33	33	public class TestProgressPanel {
34		private static final long serialVersionUID = 3008529181447712097L;
35	34
36	35	private tryPanel frame = null;
37	36

     #text.properties
     abrir...=Abrir...
     abrir_archivo=Abrir Archivo
     acumulado=Acumulado
     a?adir_banda=A?adir banda
     banda=Banda
     bandas=Bandas
     crear_tabla=Crear Tabla
     datos_visualizados=Datos visualizados
     extraer=Extraer
     filtros=Filtros
     formato_no_numerico=Formato no num?rico
-...
     cerrar=Cerrar
     salir=Salir
     verdetalles=Ver detalles
     ocultardetalles=Ocultar detalles
     vista_datasource=Extensi?n de la vista
     imagen_completa=Completo
     ocultardetalles=Ocultar detalles

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2007 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
      */
     package org.gvsig.gui.beans.defaultButtonsPanel;
     import java.awt.Component;
     import java.awt.LayoutManager;
     import javax.swing.JPanel;
     import org.gvsig.gui.beans.buttonsPanel.ButtonsPanel;
     /**
      * <code>DialogPanel</code> es un Panel que hereda de <code>JPanel</code> con
      * el a?adido de poder definir una botonera por defecto.
+     *
      * @version 15/03/2007
      * @author Borja Sanchez Zamorano (borja.sanchez@iver.es)
      */
     public class DefaultButtonsPanel extends JPanel {
     	private static final long serialVersionUID = 1519536113682350563L;
     	ButtonsPanel bp = null;
     	JPanel content = null;
     	/**
     	 * Crea el <code>DialogPanel</code> con los botones por defecto.
     	 */
     	public DefaultButtonsPanel() {
         super.setLayout(new java.awt.BorderLayout(5, 5));
     		getButtonsPanel().addAccept();
     		getButtonsPanel().addCancel();
     		getButtonsPanel().addApply();
     		super.add(getButtonsPanel(), java.awt.BorderLayout.SOUTH);
     		super.add(getContent(), java.awt.BorderLayout.CENTER);
+    	}
     	/**
     	 * Crea el <code>DialogPanel</code> con los botones que definamos de la clase
     	 * <code>ButtonsPanel</code>
+    	 *
     	 * @param buttons Constante para definir que botones se crear?n
     	 */
     	public DefaultButtonsPanel(int buttons) {
         super.setLayout(new java.awt.BorderLayout(5, 5));
     		bp = new ButtonsPanel(buttons);
     		super.add(getButtonsPanel(), java.awt.BorderLayout.SOUTH);
     		super.add(getContent(), java.awt.BorderLayout.CENTER);
+    	}
     	/**
     	 * Obtener el objeto <code>ButtonsPanel</code> del <code>DialogPanel</code>.
     	 * En caso de no estar creado, lo crear?.
+    	 *
     	 * @return El componente bp
     	 */
     	public ButtonsPanel getButtonsPanel() {
     		if (bp == null)
     			bp = new ButtonsPanel();
     		return bp;
+    	}
     	/**
     	 * Obtener el contenido del <code>DialogPanel</code>. En caso de no estar creado,
     	 * lo crear?.
+    	 *
     	 * @return El componente content
     	 */
     	public JPanel getContent() {
     		if (content == null)
     			content = new JPanel();
     		return content;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.Container#getLayout()
     	 */
     	public LayoutManager getLayout() {
     		return getContent().getLayout();
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.Container#setLayout(java.awt.LayoutManager)
     	 */
     	public void setLayout(LayoutManager mgr) {
     		getContent().setLayout(mgr);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.Container#add(java.awt.Component)
     	 */
     	public Component add(Component comp) {
     		return getContent().add(comp);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.Container#add(java.awt.Component, int)
     	 */
     	public Component add(Component comp, int index) {
     		return getContent().add(comp, index);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.Container#add(java.awt.Component, java.lang.Object)
     	 */
     	public void add(Component comp, Object constraints) {
     		getContent().add(comp, constraints);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.Container#add(java.awt.Component, java.lang.Object, int)
     	 */
     	public void add(Component comp, Object constraints, int index) {
     		getContent().add(comp, constraints, index);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.Container#add(java.lang.String, java.awt.Component)
     	 */
     	public Component add(String name, Component comp) {
     		return getContent().add(name, comp);
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2007 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
      */
     package org.gvsig.gui.beans.progressPanel;
     /**
      * <code>LogControl</code>. Objeto para un control b?sico de un log. Para a?adir
      * y reemplazar la ?ltima l?nea a?adida.
+     *
      * @version 27/03/2007
      * @author Borja Sanchez Zamorano (borja.sanchez@iver.es)
      */
     public class LogControl {
     	String text = "";
     	/**
     	 * A?ade una l?nea al log.
     	 * @param line
     	 */
     	public void addLine(String line) {
     		if (text.length()>0)
     			text += "\n";
     		text += line;
+    	}
     	/**
     	 * Reemplaza la ?ltima l?nea a?adida al log.
     	 * @param line
     	 */
     	public void replaceLastLine(String line) {
     		int index =  text.lastIndexOf("\n");
     		if (index<0) index = 0;
     		text = text.substring(0, index);
     		addLine(line);
+    	}
     	/**
     	 * Establece el texto completo del log.
     	 * @param value
     	 */
     	public void setText(String value) {
     		text = value;
+    	}
     	/**
     	 * Devuelve el contenido del log.
     	 * @return String
     	 */
     	public String getText() {
     		return text;
+    	}
+    }

     import javax.swing.JTextPane;
     import org.gvsig.gui.beans.buttonsPanel.ButtonsPanel;
     /**
      * <code>ProgressPanel</code>. Muestra una ventana de di?logo para representar
      * una barra de progreso con su ventana de registro.
-...
     	private JProgressBar jProgressBar = null;
     	private JScrollPane jScrollPane = null;
     	private JTextPane jTextPane = null;
     	private String realText = "";
     	private LogControl text = new LogControl();
     	/**
     	 * Constructor
     	 */
     	public ProgressPanel() {
     		// TODO Auto-generated constructor stub
     		initialize();
+    	}
-...
     		return jTextPane;
+    	}
     	private void updateLog() {
     		jTextPane.setText(text.getText());
+    	}
     	public void addLineLog(String line) {
     		realText = jTextPane.getText();
     		jTextPane.setText(realText + line + "\n");
     		text.addLine(line);
     		updateLog();
+    	}
     	public void replaceLastLineLog(String line) {
     		jTextPane.setText(realText + line + "\n");
     		text.replaceLastLine(line);
     		updateLog();
+    	}
     	public void setLog(String value) {
     		text.setText(value);
     		updateLog();
+    	}
     	public int getPercent() {
     		return jProgressBar.getValue();
+    	}

     package org.gvsig.gui.beans.IncrementableTask;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import java.awt.event.WindowAdapter;
     import java.awt.event.WindowEvent;
     import org.gvsig.gui.beans.buttonsPanel.ButtonsPanel;
     import org.gvsig.gui.beans.progressPanel.ProgressPanel;
     public class IncrementableTask extends Thread implements ActionListener {
     	IIncrementable iIncrementable;
     	ProgressPanel progressPanel = null;
     	public IncrementableTask(IIncrementable incrementable) {
     		iIncrementable = incrementable;
+    	}
     	/**
     	 * Este thread va leyendo el porcentaje hasta que se completa el histograma.
     	 */
     	public synchronized void run(){
     		while(true){
     			showWindow();
     			while (iIncrementable.getPercent() < 100){
     				getProgressPanel().setLabel(iIncrementable.getLabel());
     				getProgressPanel().setPercent(iIncrementable.getPercent());
     				getProgressPanel().setTitle(iIncrementable.getTitle());
     				getProgressPanel().setLog(iIncrementable.getLog());
     				try {
     					sleep(100);
     				} catch (InterruptedException e) {
     					e.printStackTrace();
+    				}
+    			}
     			//Cerramos la ventana
     			handleClose();
     			this.suspend();
+    		}
+    	}
     	private void handleClose() {
     		getProgressPanel().setVisible(false);
     		getProgressPanel().hide();
     		progressPanel = null;
     		System.out.println("Cerrado");
+    	}
     	/**
     	 * Muestra la ventana de incremento con el porcentaje de la construcci?n del
     	 * histograma.
     	 */
     	public void showWindow(){
     		getProgressPanel().setTitle(iIncrementable.getTitle());
     		getProgressPanel().showLog(false);
     		getProgressPanel().show();
     		if(this.isAlive())
     			this.resume();
     		else
     			this.start();
+    	}
     	private ProgressPanel getProgressPanel() {
     		if (progressPanel == null) {
     			progressPanel = new ProgressPanel();
     			progressPanel.getButtonsPanel().addActionListener(this);
     			progressPanel.addWindowListener( new WindowAdapter() {
             public void windowClosing(WindowEvent e)
+            {
               handleClose();
+            }
           });
+    		}
     		return progressPanel;
+    	}
     	public void actionPerformed(ActionEvent e) {
     		if (e.getActionCommand().compareTo(ButtonsPanel.BUTTON_CANCEL + "") == 0) {
     			handleClose();
+    		}
+    	}
+    }

     package org.gvsig.gui.beans.IncrementableTask;
     public interface IIncrementable {
     	/**
     	 * Devuelve el titulo de la ventana IncrementableTask
     	 * @return String
     	 */
     	public String getTitle();
     	/**
     	 * Devuelve el contenido del log de la ventana IncrementableTask
     	 * @return String
     	 */
     	public String getLog();
     	/**
     	 * Devuelve la etiqueta de la ventana IncrementableTask
     	 * @return String
     	 */
     	public String getLabel();
     	/**
     	 * Devuelve el porcentaje de 0 a 100 de la ventana IncrementableTask
     	 * @return int
     	 */
     	public int getPercent();
+    }

| gvSIG desktop 1

Revision 10945