/ - Diff - Application: gvSIG desktop - gvSIG

Revision 37597

     import javax.swing.JSlider;
     import javax.swing.JTable;
     import javax.swing.ListSelectionModel;
     import javax.swing.SwingConstants;
     import javax.swing.table.DefaultTableCellRenderer;
     import javax.swing.table.TableColumn;
-...
     import org.gvsig.tools.undo.UndoRedoStack;
     public class CommandStackDialog extends DefaultBean implements SingletonWindow, IWindowListener,Observer{
     @SuppressWarnings("serial")
     public class CommandStackDialog extends DefaultBean implements SingletonWindow, IWindowListener, Observer{
     	private JTable commandTable = null;
     	private JPanel topPanel = null;
-...
     		commandTable.addMouseListener(new java.awt.event.MouseAdapter() {
     			public void mousePressed(java.awt.event.MouseEvent e) {
     				int newpos=commandTable.getSelectedRow();
     				commandTableModel.setPos(newpos);
     				int newpos = commandTable.getSelectedRow();
     				commandTableModel.setPos(newpos);
     				PluginServices.getMainFrame().enableControls();
+    			}
     		});
-...
+    	}
     	public void windowClosed() {
     		// TODO Auto-generated method stub
+    	}
     	/* (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.edition.commands.CommandListener#executeCommand(com.iver.cit.gvsig.fmap.edition.commands.CommandEvent)
     	 */
     	public void commandRepaint() {
     		setValue(commandTableModel.getPos()+1,true);
     		refreshControls();
     		setValue(commandTableModel.getPos(), true);
     		refreshSliderSize();
+    	}
-...
          * Refreshes all the mutable controls in this component.
          */
         private void refreshControls() {
             int normalizedValue = (int) (((commandTableModel.getRowCount()-currentValue) / (float) commandTableModel.getRowCount())*100);
             int normalizedValue = (int) (((commandTableModel.getRowCount() - (currentValue + 1)) / (float)commandTableModel.getRowCount()) * 100);
             //Adding the 50% od the interval
             if (commandTableModel.getRowCount() > 0){
                 normalizedValue = normalizedValue + (100 / (commandTableModel.getRowCount() * 2));
+            }
             refreshSlider(normalizedValue);
             commandTable.repaint();
+        }
         /**
          * Sets the slider to the correct (scaled) position.
          * @param normalizedValue
-...
             if (!refreshing){
                 refreshing = true;
                 getJSlider().setValue(normalizedValue);
                 refreshing = false;
                 refreshing = false;
+            }
+        }
         private void refreshSliderSize(){
             if (!refreshing){
                 Dimension size=new Dimension(commandSlider.getPreferredSize().width,((commandTableModel.getRowCount())*getTable().getRowHeight()));
                 JScrollBar verticalScrollBar=getJScrollPane().getVerticalScrollBar();//ove(size.width,size.height);
                 Dimension size = new Dimension(commandSlider.getPreferredSize().width,
                     ((commandTableModel.getRowCount())*getTable().getRowHeight()));
                 JScrollBar verticalScrollBar = getJScrollPane().getVerticalScrollBar();
                 verticalScrollBar.setValue(commandTableModel.getPos()*getTable().getRowHeight());
                 commandSlider.setPreferredSize(size);
                 commandSlider.setSize(size);
-...
     	 */
     	private JSlider getJSlider() {
     		if (commandSlider == null) {
     			commandSlider = new JSlider();
     			commandSlider = new JSlider(JSlider.VERTICAL, 0, 100, 0);
+    		}
     		return commandSlider;
+    	}
     	private void initSlider(){
     		commandSlider.setOrientation(SwingConstants.VERTICAL);
     		commandSlider.setPreferredSize(new Dimension(commandSlider.getPreferredSize().width,((getTable().getRowCount())*getTable().getRowHeight())));
     		commandSlider.addMouseListener(new java.awt.event.MouseAdapter() {
                     public void mouseReleased(java.awt.event.MouseEvent e) {
     	private void initSlider(){
     		commandSlider.setPreferredSize(
     		    new Dimension(commandSlider.getPreferredSize().width,
     		        ((getTable().getRowCount())*getTable().getRowHeight())));
+                	}
                 });
         	commandSlider.addChangeListener(new javax.swing.event.ChangeListener() {
     		commandSlider.addChangeListener(new javax.swing.event.ChangeListener() {
     				public void stateChanged(javax.swing.event.ChangeEvent e) {
     					int value = (int) (getJSlider().getValue() * commandTableModel.getRowCount() * 0.01);
                        	if (!refreshing) {
                        	    refreshing = true;
     						commandTableModel.setPos(commandTableModel.getRowCount()-1-value);
     						refreshing = false;
+    					}
     				    if (!refreshing){
     				        int value = getTablePosFromSlider();
     				        if (currentValue != value){
     				            refreshing = true;
     				            commandTableModel.setPos(value);
     				            refreshing = false;
+    				        }
+    				    }
+    			    }
         		});
         	setValue(commandTableModel.getRowCount()-1-commandTableModel.getPos(),true);
         	setValue(commandTableModel.getRowCount() - 1 - commandTableModel.getPos(),true);
+    	}
     	private int getTablePosFromSlider(){
     	    if (commandTableModel.getRowCount() == 0){
     	        return -1;
+    	    }
     	    int value = getJSlider().getValue();
     	    value = (int) ((value * 0.01) * commandTableModel.getRowCount());
     	    //If the slider in in the 100% the previous row has to be selected
     	    if (value == commandTableModel.getRowCount()){
     	        value--;
+    	    }
     	    //The bottom part of the slider starts in 100: take the reverse value
     	    value = (commandTableModel.getRowCount() - 1) - value;
     	    return value;
+    	}
         public void setValue(int number, boolean fireEvent) {
             int rowCount=commandTableModel.getRowCount();
             int rowCount = commandTableModel.getRowCount();
             if (number < lowLimit) {
     			number = lowLimit;
+    		}
             if (number > rowCount) {
             if (number > (rowCount - 1)) {
     			number = rowCount;
+    		}
             if (number != currentValue) {
-...
             	if (fireEvent) {
     				callValueChanged(new Integer(currentValue));
+    			}
+            }
             int selpos=rowCount-1-number;
             if (selpos>=0){
            	 	getTable().setRowSelectionInterval(selpos,selpos);
             } else {
     			getTable().clearSelection();
+    		}
+            }
+        }
     	/**
-...
     				featureStoreNotification.getSource().deleteObserver(this);
     				return;
+    			}
     			//Only repaint if the event is a selection event or an edition event
     			if (FeatureStoreNotification.AFTER_INSERT.equals(type) ||
                     FeatureStoreNotification.AFTER_DELETE.equals(type) ||
                     FeatureStoreNotification.AFTER_UPDATE.equals(type) ||
                     FeatureStoreNotification.SELECTION_CHANGE.equals(type)) {
     			    commandRepaint();
+    			}
+    		}
     		commandRepaint();
+    	}
     	public Object getWindowProfile() {
     		return WindowInfo.DIALOG_PROFILE;
+    	}
     }  //  @jve:decl-index=0:visual-constraint="10,10"
+    }

     import javax.swing.table.AbstractTableModel;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.tools.undo.RedoException;
     import org.gvsig.tools.undo.UndoException;
     import org.gvsig.tools.undo.UndoRedoStack;
     import org.gvsig.tools.undo.command.Command;
     @SuppressWarnings("serial")
     public class CommandTableModel extends AbstractTableModel{
     private UndoRedoStack cr;
     public CommandTableModel(UndoRedoStack cr) {
     	this.cr=cr;
         private static final Logger LOG =
             LoggerFactory.getLogger(CommandTableModel.class);
         private UndoRedoStack cr;
         public CommandTableModel(UndoRedoStack cr) {
             this.cr = cr;
+    	}
     	public int getPos() {
     		return cr.getUndoInfos().size()-1;
     		return cr.getUndoInfos().size() - 1;
+    	}
     	public int getColumnCount() {
     		return 1;
+    	}
     	public int getRowCount() {
     		return cr.getRedoInfos().size()+cr.getUndoInfos().size();
     		return cr.getRedoInfos().size() + cr.getUndoInfos().size();
+    	}
     	public Object getValueAt(int i, int j) {
     	@SuppressWarnings("unchecked")
         public Object getValueAt(int i, int j) {
     		Command[] undos=(Command[])cr.getUndoInfos().toArray(new Command[0]);
     		Command[] redos=(Command[])cr.getRedoInfos().toArray(new Command[0]);
     		if (i<undos.length){
-...
     			return redos[i-undos.length];
+    		}
+    	}
     	public void setPos(int newpos) {
     		try {
     			if (newpos>getPos()){
     				cr.redo(newpos-getPos());
     			}else{
     				cr.undo(getPos()-newpos);
     			if (newpos > getPos()) {
     				cr.redo(newpos - getPos());
     			}else if (newpos < getPos()) {
     				cr.undo(getPos() - newpos);
+    			}
     		} catch (RedoException e) {
     			e.printStackTrace();
     			LOG.error("Error executing the command", e);
     		} catch (UndoException e) {
     			e.printStackTrace();
     		    LOG.error("Error executing the command", e);
+    		}
+    	}
+    }

Also available in: Unified diff