Revision 11588 branches/v10/extensions/extAnnotations/src/com/iver/cit/gvsig/project/documents/gui/Annotation_ConfigureLabel.java

View differences:

Annotation_ConfigureLabel.java
272 272
                new int[] { Types.INTEGER, Types.DOUBLE });
273 273
            this.cmbAngle.addItemListener(this.eventsListener);
274 274

  
275
            if (sds!=null && layer.getMapping()!=null){
276
            	int index=layer.getMapping().getColumnRotate();
275
            if (sds!=null && layer.getAnnotatonMapping()!=null){
276
            	int index=layer.getAnnotatonMapping().getColumnRotate();
277 277
            	setSelectedItem(index,cmbAngle);
278 278
            	updateButtonsState();
279 279
            }
......
293 293
            this.cmbColor.setBounds(cmbColorPosition);
294 294
            this.fillFieldsNames(this.cmbColor, new int[] { Types.INTEGER });
295 295
            this.cmbColor.addItemListener(this.eventsListener);
296
            if (sds!=null && layer.getMapping()!=null){
297
            	int index=layer.getMapping().getColumnColor();
296
            if (sds!=null && layer.getAnnotatonMapping()!=null){
297
            	int index=layer.getAnnotatonMapping().getColumnColor();
298 298
            	setSelectedItem(index,cmbColor);
299 299
            }
300 300
        }
......
324 324
            this.fillFieldsNames(this.cmbSize,
325 325
                new int[] { Types.INTEGER, Types.DOUBLE });
326 326
            this.cmbSize.addItemListener(this.eventsListener);
327
            if (sds!=null && layer.getMapping()!=null){
328
            	int index=layer.getMapping().getColumnHeight();
327
            if (sds!=null && layer.getAnnotatonMapping()!=null){
328
            	int index=layer.getAnnotatonMapping().getColumnHeight();
329 329
            	setSelectedItem(index,cmbSize);
330 330
            }
331 331
        }
......
360 360
            this.fillFieldsNames(this.cmbFont,
361 361
                new int[] { Types.VARCHAR, Types.LONGVARCHAR });
362 362
            this.cmbFont.addItemListener(this.eventsListener);
363
            if (sds!=null && layer.getMapping()!=null){
364
            	int index=layer.getMapping().getColumnTypeFont();
363
            if (sds!=null && layer.getAnnotatonMapping()!=null){
364
            	int index=layer.getAnnotatonMapping().getColumnTypeFont();
365 365
            	setSelectedItem(index,cmbFont);
366 366
            }
367 367
        }

Also available in: Unified diff