Revision 298 org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.swing/org.gvsig.tools.swing.serv/org.gvsig.tools.swing.serv.field/src/main/java/org/gvsig/tools/swing/serv/field/component/JTextFieldComponent.java

View differences:

JTextFieldComponent.java
67 67
     * @param dynObject
68 68
     * @throws ServiceException
69 69
     */
70
    public JTextFieldComponent(ValueField parent)
71
        throws ServiceException {
70
    public JTextFieldComponent(ValueField parent) throws ServiceException {
72 71
        super(parent);
73 72
    }
74 73

  
......
89 88
     * @see org.gvsig.tools.swing.api.dynobject.JComponent#getComponent()
90 89
     */
91 90
    public JComponent asJComponent() {
92
        if (pane != null)
91
        if (pane != null) {
93 92
            return pane;
94
        if (label != null)
93
        }
94
        if (label != null) {
95 95
            this.pane = createPane(label);
96
        else
97
            if (jtext != null)
96
        } else
97
            if (jtext != null) {
98 98
                this.pane = createPane(jtext);
99
        // if (label != null)
100
        // return this.label;
101
        // else if (jtext != null)
102
        // return this.jtext;
103
        
99
                // if (label != null)
100
                // return this.label;
101
                // else if (jtext != null)
102
                // return this.jtext;
103
            }
104

  
104 105
        return pane;
105 106
    }
106 107

  
......
121 122
            tf.setFont(tf.getFont().deriveFont(12f));
122 123
            tf.setRows(2);
123 124
        }
124
//        JTextField tff = new JTextField();
125
//        tff.setEditable(false);
126
//        tff.add(tf);
125
        // JTextField tff = new JTextField();
126
        // tff.setEditable(false);
127
        // tff.add(tf);
127 128
        // tf.setVisible(false);
128 129
        this.jtext = tf;
129 130
        return tf;
......
141 142
     * org.gvsig.tools.swing.api.dynobject.dynfield.JDynFieldComponent#getValue
142 143
     * ()
143 144
     */
145
    @Override
144 146
    public Object getValue() {
145
        if (label != null)
147
        if (label != null) {
146 148
            return label.getText();
147
        else
148
            if (jtext != null)
149
        } else
150
            if (jtext != null) {
149 151
                return jtext.getText();
152
            }
150 153
        return null;
151 154
    }
152 155

  
......
188 191
     * @see
189 192
     * 
190 193
     * 
194
     * 
195
     * 
191 196
     * org.gvsig.tools.swing.api.dynobject.dynfield.JDynFieldComponent#isMandatory
192 197
     * ()
193 198
     */
......
231 236
     * @see
232 237
     * 
233 238
     * 
239
     * 
240
     * 
234 241
     * org.gvsig.tools.swing.api.dynobject.dynfield.JDynFieldComponent#requestFocus
235 242
     * ()
236 243
     */
237 244
    public void requestFocus() {
238
        if (label != null)
245
        if (label != null) {
239 246
            label.requestFocus();
240
        else
247
        } else {
241 248
            jtext.requestFocus();
249
        }
242 250
    }
243 251

  
244 252
    /*
......
247 255
     * @see
248 256
     * 
249 257
     * 
258
     * 
259
     * 
250 260
     * org.gvsig.tools.swing.api.dynobject.dynfield.JDynFieldComponent#setEnabled
251 261
     * (boolean)
252 262
     */
253 263
    public void setEnabled(boolean isEnabled) {
254 264
        label.setEnabled(isEnabled);
255
        if (label != null)
265
        if (label != null) {
256 266
            label.setEnabled(isEnabled);
257
        else
258
            if (jtext != null)
267
        } else
268
            if (jtext != null) {
259 269
                jtext.setEnabled(isEnabled);
270
            }
260 271
    }
261 272

  
262 273
    /*
......
267 278
     */
268 279
    @Override
269 280
    protected void setJDynFieldComponentListeners() {
270
        if (label != null)
281
        if (label != null) {
271 282
            label.addKeyListener(this);
272
        else
273
            if (jtext != null)
283
        } else
284
            if (jtext != null) {
274 285
                jtext.addKeyListener(this);
286
            }
275 287
    }
276 288

  
277
    /*
278
     * (non-Javadoc)
279
     * 
280
     * @see org.gvsig.tools.swing.spi.AbstractJDynFieldComponent#setReadOnly()
281
     */
282 289
    @Override
283
    protected void setReadOnly() {
284
        if (jtext != null) {
285
            jtext.setEditable(false);
286
        }
290
    protected void setNonNullValue(Object value) {
291
        if (label != null) {
292
            label.setText(value.toString());
293
        } else
294
            if (jtext != null) {
295
                jtext.setText(value.toString());
296
            }
287 297
    }
288 298

  
289 299
    /*
......
293 303
     * org.gvsig.tools.swing.api.dynobject.dynfield.JDynFieldComponent#setValue
294 304
     * (java.lang.Object)
295 305
     */
306
    @Override
296 307
    protected void setNullValue() {
297 308
        setNonNullValue("");
298 309
    }
299 310

  
300
    protected void setNonNullValue(Object value) {
301
        if (label != null)
302
            label.setText(value.toString());
303
        else
304
            if (jtext != null) {
305
                jtext.setText(value.toString());
306
            }
311
    /*
312
     * (non-Javadoc)
313
     * 
314
     * @see org.gvsig.tools.swing.spi.AbstractJDynFieldComponent#setReadOnly()
315
     */
316
    @Override
317
    protected void setReadOnly() {
318
        if (jtext != null) {
319
            jtext.setEditable(false);
320
        }
307 321
    }
308 322
}

Also available in: Unified diff