/ - Diff - Library: org.gvsig.tools - gvSIG

Revision 1723

org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/task/impl/BaseTaskStatus.java
214	214	}
215	215	}
216	216
	217	public String getMessage() {
	218	return this.values.message;
	219	}
	220
217	221	@Override
218	222	public void terminate() {
219	223	if (!isRunning) {

org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/task/TaskStatus.java
64	64	*/
65	65	public String getLabel();
66	66
	67	public String getMessage();
67	68	/**
68	69	* Return true if the task has cancelled by the
69	70	* user or another task.

     import javax.swing.BoxLayout;
     import javax.swing.JPanel;
     import javax.swing.JScrollPane;
     import javax.swing.SwingUtilities;
     import org.gvsig.tools.observer.Observable;
     import org.gvsig.tools.observer.Observer;
-...
             for (JTaskStatus taskStatus : controlsToAdd) {
                 listPanel.add(taskStatus);
+            }
             listPanel.setAlignmentY(Component.BOTTOM_ALIGNMENT);
             listPanel.setAlignmentY(Component.TOP_ALIGNMENT);
             JScrollPane scroller = new JScrollPane(listPanel);
             scroller.setAlignmentY(Component.BOTTOM_ALIGNMENT);
             scroller.setAlignmentY(Component.TOP_ALIGNMENT);
             scroller.setPreferredSize(new Dimension(300, 150));
             this.add(scroller, BorderLayout.CENTER);
+        }
-...
+        }
         @Override
         public void update(Observable observable, Object notification) {
         public void update(final Observable observable, final Object notification) {
             if (!(observable instanceof TaskStatusManager)) {
                 return;
+            }
             if( !SwingUtilities.isEventDispatchThread() ) {
                 SwingUtilities.invokeLater(new Runnable() {
                     @Override
                     public void run() {
                         update(observable, notification);
+                    }
                 });
                 return;
+            }
             if (notification == null || this.manager.isEmpty() ) {
                 // remove task
                 listPanel.removeAll();

     /**
      * Default implementation of the {@link JTaskStatus}.
+     *
+     *
      * @author gvSIG Team
      * @version $Id$
      */
     public class DefaultJTaskStatus extends JTaskStatus implements Observer {
     	private static final long serialVersionUID = -1908456747637477552L;
         private static final long serialVersionUID = -1908456747637477552L;
     	private JLabel titlelabel = null;
     	private JLabel messagelabel = null;
     	private JProgressBar progressBar = null;
     	private JButton cancelRequestButton = null;
     	private JButton removeTaskButton;
         private JLabel titlelabel = null;
         private JLabel messagelabel = null;
         private JProgressBar progressBar = null;
         private JButton cancelRequestButton = null;
         private JButton removeTaskButton;
     	private boolean showCancelButton;
     	private boolean showRemoveTaskButton;
         private boolean showCancelButton;
         private boolean showRemoveTaskButton;
     	private TaskStatus taskStatus;
         private TaskStatus taskStatus;
     	public DefaultJTaskStatus() {
     		this.taskStatus = null;
     		this.showCancelButton = true;
     		this.createComponents();
+    	}
     	public DefaultJTaskStatus(TaskStatus taskStatus) {
     		this();
     		this.bind(taskStatus);
+    	}
     	public boolean getShowCancelButton() {
     		return this.showCancelButton;
+    	}
     	public void setShowCancelButton(boolean showCancelButton) {
     		this.showCancelButton = showCancelButton;
     		if( this.cancelRequestButton != null ) {
         		this.cancelRequestButton.setVisible(this.showCancelButton);
+        	}
+    	}
     	public boolean getShowRemoveTaskButton() {
     		return this.showRemoveTaskButton;
+    	}
     	public void setShowRemoveTaskButton(boolean showRemoveTaskButton) {
     		this.showRemoveTaskButton = showRemoveTaskButton;
     		if( this.removeTaskButton != null ) {
         		this.removeTaskButton.setVisible(this.showRemoveTaskButton);
+        	}
+    	}
     	public JComponent asJComponent() {
     		return this;
+    	}
         public DefaultJTaskStatus() {
             this.taskStatus = null;
             this.showCancelButton = true;
             this.createComponents();
+        }
     	public void bind(TaskStatus taskStatus) {
     		if( this.taskStatus!=null ) {
     			this.taskStatus.deleteObserver(this);
+    		}
     		this.taskStatus = taskStatus;
     		if( this.taskStatus!=null ) {
     			this.taskStatus.addObserver(this);
+    		}
+    	}
         public DefaultJTaskStatus(TaskStatus taskStatus) {
             this();
             this.bind(taskStatus);
+        }
     	private void createComponents() {
     		this.titlelabel = new JLabel();
     		this.progressBar = new JProgressBar(1,100);
         public boolean getShowCancelButton() {
             return this.showCancelButton;
+        }
         public void setShowCancelButton(boolean showCancelButton) {
             this.showCancelButton = showCancelButton;
             if (this.cancelRequestButton != null) {
                 this.cancelRequestButton.setVisible(this.showCancelButton);
+            }
+        }
         public boolean getShowRemoveTaskButton() {
             return this.showRemoveTaskButton;
+        }
         public void setShowRemoveTaskButton(boolean showRemoveTaskButton) {
             this.showRemoveTaskButton = showRemoveTaskButton;
             if (this.removeTaskButton != null) {
                 this.removeTaskButton.setVisible(this.showRemoveTaskButton);
+            }
+        }
         public JComponent asJComponent() {
             return this;
+        }
         public void bind(TaskStatus taskStatus) {
             if (this.taskStatus != null) {
                 this.taskStatus.deleteObserver(this);
+            }
             this.taskStatus = taskStatus;
             if (this.taskStatus != null) {
                 this.taskStatus.addObserver(this);
+            }
+        }
         private void createComponents() {
             this.titlelabel = new JLabel();
             this.progressBar = new JProgressBar(1, 100);
             this.progressBar.setPreferredSize(new Dimension(200, 10));
     		this.progressBar.setIndeterminate(false);
     		this.progressBar.setBorderPainted(true);
     		this.cancelRequestButton = new JButton();
     		this.cancelRequestButton.setPreferredSize( new Dimension(16, 16));
     		this.cancelRequestButton.setBorderPainted(false);
         	this.cancelRequestButton.setIcon( getIcon("cancelRequestButton.png"));
         	this.cancelRequestButton.setDisabledIcon( getIcon("disabledCancelRequestButton.png") );
         	if( !this.showCancelButton ) {
         		this.cancelRequestButton.setVisible(this.showCancelButton);
+        	}
         	this.cancelRequestButton.addActionListener(new ActionListener() {
     			public void actionPerformed(ActionEvent arg0) {
     				cancelRequestButton.setEnabled(false);
     				taskStatus.cancelRequest();
+    			}
     		});
     		this.removeTaskButton = new JButton();
     		this.removeTaskButton.setPreferredSize( new Dimension(16, 16));
     		this.removeTaskButton.setBorderPainted(false);
         	this.removeTaskButton.setIcon( getIcon("removeTaskButton.png"));
         	this.removeTaskButton.setDisabledIcon( getIcon("disabledRemoveTaskButton.png") );
         	this.removeTaskButton.setEnabled(false);
         	this.removeTaskButton.addActionListener(new ActionListener() {
     			public void actionPerformed(ActionEvent arg0) {
     				if( !taskStatus.isRunning() ) {
     					taskStatus.getManager().remove(taskStatus);
+    				}
+    			}
     		});
     		this.messagelabel = new JLabel();
             this.progressBar.setIndeterminate(false);
             this.progressBar.setBorderPainted(true);
     		this.setLayout(new GridBagLayout());
     		this.add(this.titlelabel, 0, 0, GridBagConstraints.HORIZONTAL, 0.98, 0);
     		this.add(this.progressBar, 0, 1, GridBagConstraints.HORIZONTAL, 0.98, 0);
     		this.add(this.messagelabel, 0, 2, GridBagConstraints.HORIZONTAL, 0.98, 0);
     		this.add(this.cancelRequestButton, 1, 1, GridBagConstraints.NONE, 0.01, 0);
     		this.add(this.removeTaskButton, 2, 1, GridBagConstraints.NONE, 0.01, 0);
+    	}
             this.cancelRequestButton = new JButton();
             this.cancelRequestButton.setPreferredSize(new Dimension(16, 16));
             this.cancelRequestButton.setBorderPainted(false);
             this.cancelRequestButton.setIcon(getIcon("cancelRequestButton.png"));
             this.cancelRequestButton.setDisabledIcon(getIcon("disabledCancelRequestButton.png"));
             if (!this.showCancelButton) {
                 this.cancelRequestButton.setVisible(this.showCancelButton);
+            }
             this.cancelRequestButton.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent arg0) {
                     cancelRequestButton.setEnabled(false);
                     taskStatus.cancelRequest();
+                }
             });
             this.removeTaskButton = new JButton();
             this.removeTaskButton.setPreferredSize(new Dimension(16, 16));
             this.removeTaskButton.setBorderPainted(false);
             this.removeTaskButton.setIcon(getIcon("removeTaskButton.png"));
             this.removeTaskButton.setDisabledIcon(getIcon("disabledRemoveTaskButton.png"));
             this.removeTaskButton.setEnabled(true);
             this.removeTaskButton.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent arg0) {
                     if (taskStatus.isRunning()) {
                         if( (arg0.getModifiers() & ActionEvent.CTRL_MASK) == ActionEvent.CTRL_MASK ) {
                             taskStatus.getManager().remove(taskStatus);
+                        }
                     } else {
                         taskStatus.getManager().remove(taskStatus);
+                    }
+                }
             });
     	private ImageIcon getIcon(String name) {
     		URL iconurl = this.getClass().getResource(name);
     		if( iconurl == null ) {
     			return new ImageIcon();
+    		}
     		return new ImageIcon(iconurl);
+    	}
     	private void add(Component comp, int gridx, int gridy, int fill, double weightx, double weighty) {
     		GridBagConstraints c = new GridBagConstraints();
     		c.fill = fill;
     		c.gridx = gridx;
     		c.gridy = gridy;
     		c.weightx = weightx;
     		c.weighty = weighty;
     		this.add(comp, c);
+    	}
             this.messagelabel = new JLabel();
     	public void update(final Observable observable, final Object notification) {
             this.setLayout(new GridBagLayout());
     		if(observable != null && !(observable instanceof TaskStatus) ) {
     			return;
+    		}
     		if( !SwingUtilities.isEventDispatchThread()) {
     			SwingUtilities.invokeLater( new Runnable() {
     				public void run() {
     					update(observable, notification);
+    				}
     			});
     			return;
+    		}
     		TaskStatus taskStatus = (TaskStatus) observable;
     		if( taskStatus == null || !taskStatus.isRunning() ) {
     			this.messagelabel.setText(taskStatus.getLabel());
     			this.progressBar.setIndeterminate(false);
     			this.progressBar.setValue(100);
     			this.cancelRequestButton.setEnabled(false);
     			this.removeTaskButton.setEnabled(true);
     			return;
+    		}
             this.add(this.titlelabel, 0, 0, GridBagConstraints.HORIZONTAL, 0.98, 0);
             this.add(this.progressBar, 0, 1, GridBagConstraints.HORIZONTAL, 0.98, 0);
             this.add(this.messagelabel, 0, 2, GridBagConstraints.HORIZONTAL, 0.98, 0);
             this.add(this.cancelRequestButton, 1, 1, GridBagConstraints.NONE, 0.01, 0);
             this.add(this.removeTaskButton, 2, 1, GridBagConstraints.NONE, 0.01, 0);
+        }
         private ImageIcon getIcon(String name) {
             URL iconurl = this.getClass().getResource(name);
             if (iconurl == null) {
                 return new ImageIcon();
+            }
             return new ImageIcon(iconurl);
+        }
         private void add(Component comp, int gridx, int gridy, int fill, double weightx, double weighty) {
             GridBagConstraints c = new GridBagConstraints();
             c.fill = fill;
             c.gridx = gridx;
             c.gridy = gridy;
             c.weightx = weightx;
             c.weighty = weighty;
             this.add(comp, c);
+        }
         public void update(final Observable observable, final Object notification) {
             if (observable != null && !(observable instanceof TaskStatus)) {
                 return;
+            }
             if (!SwingUtilities.isEventDispatchThread()) {
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {
                         update(observable, notification);
+                    }
                 });
                 return;
+            }
             TaskStatus taskStatus = (TaskStatus) observable;
             if (taskStatus == null || !taskStatus.isRunning()) {
                 this.messagelabel.setText(taskStatus.getLabel());
                 this.progressBar.setIndeterminate(false);
                 this.progressBar.setValue(100);
                 this.cancelRequestButton.setEnabled(false);
                 this.removeTaskButton.setEnabled(true);
                 return;
+            }
             if (taskStatus.getTitle() == null) {
                 this.titlelabel.setText("Unknown");
             } else {
                 this.titlelabel.setText(taskStatus.getTitle());
+            }
             this.messagelabel.setText(taskStatus.getLabel());
             this.progressBar.setIndeterminate( taskStatus.isIndeterminate() );
             this.progressBar.setValue( taskStatus.getCompleted() );
     		if( !this.cancelRequestButton.isEnabled() ) {
     			this.cancelRequestButton.setEnabled(true);
+    		}
+    	}
             this.progressBar.setIndeterminate(taskStatus.isIndeterminate());
             this.progressBar.setValue(taskStatus.getCompleted());
     	public TaskStatus getTaskStatus() {
     		return this.taskStatus;
+    	}
             if (!this.cancelRequestButton.isEnabled()) {
                 this.cancelRequestButton.setEnabled(true);
+            }
     	public void setTittle(String tittle) {
+        }
         public TaskStatus getTaskStatus() {
             return this.taskStatus;
+        }
         public void setTittle(String tittle) {
             setTitle(tittle);
+        }
-...
             if (this.taskStatus instanceof SimpleTaskStatus) {
                 ((SimpleTaskStatus) this.taskStatus).setTitle(title);
+            }
+    	}
+        }
     	public void message(String message) {
     		if( this.taskStatus instanceof SimpleTaskStatus ) {
     			((SimpleTaskStatus)this.taskStatus).message(message);
+    		}
+    	}
         public void message(String message) {
             if (this.taskStatus instanceof SimpleTaskStatus) {
                 ((SimpleTaskStatus) this.taskStatus).message(message);
+            }
+        }
     	public void setCurValue(long value) {
     		if( this.taskStatus instanceof SimpleTaskStatus ) {
     			((SimpleTaskStatus)this.taskStatus).setCurValue(value);
+    		}
+    	}
         public void setCurValue(long value) {
             if (this.taskStatus instanceof SimpleTaskStatus) {
                 ((SimpleTaskStatus) this.taskStatus).setCurValue(value);
+            }
+        }
+    }

     				taskStatus = taskStatus2;
+    			}
+     		}
      		String label = taskStatus.getLabel();
      		String label1 = taskStatus.getMessage();
      		String label2 = taskStatus.getLabel();
      		String title = taskStatus.getTitle();
      		if (title == null) {
      			title = "Progress";
+     		}
     		if( label == null || label.trim().equals("") ) {
     			label = title;
     		if( StringUtils.isEmpty(label2) ) {
     			label2 = title;
     		} else {
     			label = title + ": " + label;
     			label2 = title + "\n" + label2;
+    		}
     		this.label.setText( StringUtils.abbreviateMiddle(label, "...", this.maxLabelSize) );
     		this.label.setToolTipText(label );
     		this.label.setText( StringUtils.abbreviateMiddle(label1, "...", this.maxLabelSize) );
     		this.label.setToolTipText(label2);
                     if( taskStatus.isIndeterminate() ) {
                         this.progressBar.setString("");
                     } else {
                         this.progressBar.setString(String.valueOf(taskStatus.getCompleted()));
+                    }
     		this.progressBar.setIndeterminate( taskStatus.isIndeterminate() );
     		this.progressBar.setValue( taskStatus.getCompleted() );
     		if( !this.progressBar.isVisible() ) {

Also available in: Unified diff

Application: gvSIG desktop » Library: org.gvsig.tools

Revision 1723