Changeset 7109


Ignore:
Timestamp:
2004-03-22T15:43:19+12:00 (20 years ago)
Author:
kjdon
Message:

now uses the min and max values when setting the current value

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/cdm/ArgumentConfiguration.java

    r6944 r7109  
    284284    public ArgumentControl(Argument argument) {
    285285        this.argument = argument;
     286        ///ystem.err.println("generating controls for arg "+argument.getName());
    286287        String tip = "<html>" + argument.getDescription() + "</html>";
    287288        tip = Utility.formatHTMLWidth(tip, 60);
    … …  
    289290        // If this is the first control, there is no history.
    290291        if(previous_owner == null) {
     292        ///ystem.err.println("previous owner is null");
    291293        previous_owner = argument.getOwner();
    292294        addHeader(previous_owner, colour_two);
    … …  
    294296        // Otherwise if the owner of the control has changed since the last argument, toggle the colouring of the control.
    295297        else if(previous_owner != argument.getOwner()) {
     298        ///ystem.err.println("previous owner is different from current owner");
    296299        coloured = !coloured;
    297300        previous_owner = argument.getOwner();
    … …  
    361364        case Argument.INTEGER:
    362365        // Build a spinner
    363         JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, argument.getMinimum(), argument.getMaximum(), 1));
     366        int initial_value=0;
    364367        // If there was an original value, set it.
    365         if(existing_value != null) {
     368        if(existing_value != null && !existing_value.equals("")) {
    366369            try {
    367             spinner.setValue(new Integer(existing_value));
     370            initial_value = Integer.parseInt(existing_value);
     371            //spinner.setValue(new Integer(existing_value));
    368372            }
    369373            catch (Exception error) {
    370             }
    371         }
    372         else if(default_value != null) {
     374            Gatherer.println("ArgumentConfiguration Error: "+error);
     375            }
     376        } else if (default_value != null && !default_value.equals("")) {
    373377            try {
    374             spinner.setValue(new Integer(default_value));
     378            initial_value = Integer.parseInt(default_value);
     379            //spinner.setValue(new Integer(default_value));
    375380            }
    376381            catch (Exception error) {
    377             }
    378         }
     382            Gatherer.println("ArgumentConfiguration Error: "+error);
     383            }
     384        }
     385        if (initial_value < argument.getMinimum()) {
     386            initial_value = argument.getMinimum();
     387        } else if (initial_value > argument.getMaximum()) {
     388            initial_value = argument.getMaximum();
     389        }
     390
     391        JSpinner spinner = new JSpinner(new SpinnerNumberModel(initial_value, argument.getMinimum(), argument.getMaximum(), 1));
     392
    379393        // And remember it
    380394        value = spinner;
Note: See TracChangeset for help on using the changeset viewer.