Revision 2547

View differences:

org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.dynform/org.gvsig.tools.dynform.api/src/main/java/org/gvsig/tools/dynform/JDynForm.java
26 26
import java.util.List;
27 27

  
28 28
import javax.swing.Action;
29
import javax.swing.JComponent;
29 30

  
30 31
import org.gvsig.tools.dataTypes.DataType;
31 32
import org.gvsig.tools.dynobject.DynObject;
......
104 105
	public void addActionToPopupMenu(DataType tipo, String name, Action action);
105 106
	public void addSeparatorToPopupMenu(DataType tipo);
106 107
        
108
        public JComponent getFieldsContainer();
109
        
107 110
        public void clear();
108 111
        
109 112
        public DynFormContext getContext();
org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.dynform/org.gvsig.tools.dynform.spi/src/main/java/org/gvsig/tools/dynform/spi/dynform/AbstractJDynForm.java
310 310
        formPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
311 311
        JScrollPane scroll = new JScrollPane(formPanel);
312 312
        Dimension size = formPanel.getPreferredSize();
313
        if( this.formWidth<100 ) {
314
            if( size.width>800 ) {
315
                this.formWidth = 800;
316
            } else {
317
                this.formWidth = size.width;
318
            }
319
        }
320 313
        if( this.formHeight<100 ) {
321 314
            if( size.height>450 ) {
322 315
                this.formHeight = 450;
......
324 317
                this.formHeight = size.height;
325 318
            }
326 319
        }
320
        if( this.formWidth<100 ) {
321
            if( size.width>800 ) {
322
                this.formWidth = 800;
323
            } else {
324
                this.formWidth = size.width;
325
            }
326
        }
327 327
        
328 328
        if (useScrollBars) {
329 329
            int scrollBarWidth = scroll.getVerticalScrollBar().getPreferredSize().width;
......
489 489
        this.context = context;
490 490
    }
491 491

  
492
    protected abstract JComponent getFieldsContainer();
493 492
}
org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.dynform/org.gvsig.tools.dynform.impl/src/main/java/org/gvsig/tools/dynform/impl/DefaultJDynForm.java
79 79

  
80 80
    private Map components = null;
81 81
    private final ComponentsFactory componentsFactory;
82
    private JComponent fieldsContainer;
82 83

  
83 84
    public DefaultJDynForm(
84 85
            DynFormSPIManager manager, 
......
92 93
    }
93 94

  
94 95
    @Override
95
    protected JComponent getFieldsContainer() {
96

  
96
    public JComponent getFieldsContainer() {
97
        if( this.fieldsContainer != null )  {
98
            return this.fieldsContainer;
99
        }
97 100
        try {
98 101
            JComponent component;
99 102
            switch (this.getLayoutMode()) {
......
110 113
                    break;
111 114
            }
112 115
            this.callUserEvent(USERCODE_FORM_ONLOAD, this);
116
            this.fieldsContainer = component;
113 117
            return component;
114 118
        } catch (ServiceException ex) {
115 119
            throw new RuntimeException(ex);
org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.dynform/org.gvsig.tools.dynform.services/src/main/java/org/gvsig/tools/dynform/services/dynform/AbeilleJDynForm.java
292 292
    }
293 293

  
294 294
    @Override
295
    protected JComponent getFieldsContainer() {
295
    public JComponent getFieldsContainer() {
296 296
        InputStream is = null;
297 297
        FormPanel form = null;
298 298
        Resource resource = null;

Also available in: Unified diff