Revision 42265

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.annotation/org.gvsig.annotation.lib/org.gvsig.annotation.lib.impl/src/main/java/org/gvsig/annotation/impl/DefaultAnnotationCreationService.java
60 60
import org.gvsig.tools.task.AbstractMonitorableTask;
61 61
import org.gvsig.tools.task.SimpleTaskStatus;
62 62
import org.gvsig.tools.task.TaskStatusManager;
63

  
64
import org.apache.commons.lang3.StringUtils;
63 65
import org.slf4j.Logger;
64 66
import org.slf4j.LoggerFactory;
65 67

  
......
245 247
				} catch (AnnotationPositionCalculationException e) {
246 248
					LOG.error("Not possible to get the point for the geometry", e);				
247 249
				}
248
				destinationFeature.set(AnnotationManager.TEXTVALUE_ATTRIBUTE_NAME, sourceFeature.get(textAttribute));
250
		        String s = (String) sourceFeature.get(textAttribute);
251
                if (StringUtils.isEmpty(s)) {
252
                    s = this.getManager().getDefaultTextValue();
253
                }
254
				destinationFeature.set(AnnotationManager.TEXTVALUE_ATTRIBUTE_NAME, s);
249 255
				destinationFeature.set(AnnotationManager.FONTTYPE_ATTRIBUTE_NAME, fontTypeAttributeInserter.getValue(sourceFeature));
250 256
				destinationFeature.set(AnnotationManager.FONTSTYLE_ATTRIBUTE_NAME, fontStyleAttributeInserter.getValue(sourceFeature));
251 257
				destinationFeature.set(AnnotationManager.FONTCOLOR_ATTRIBUTE_NAME, fontColorAttributeInserter.getValue(sourceFeature));
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.annotation.app/org.gvsig.annotation.app.mainplugin/src/main/java/org/gvsig/annotation/app/extension/AnnotationPreferencesPage.java
39 39
import org.gvsig.annotation.AnnotationManager;
40 40
import org.gvsig.annotation.swing.AnnotationSwingLocator;
41 41
import org.gvsig.annotation.swing.JAnnotationPreferencesPanel;
42
import org.gvsig.tools.ToolsLocator;
42 43
import org.gvsig.tools.dynobject.DynObject;
44
import org.gvsig.tools.i18n.I18nManager;
43 45
/**
44 46
 *  Default configuration page.
45 47
 *  <b><b>
......
125 127

  
126 128
	public JPanel getPanel() {
127 129
			if (panel==null) {
128
				addComponent(new JLabel(PluginServices.getText(this,"text")),
130
			    I18nManager i18nManager = ToolsLocator.getI18nManager();
131
			    JLabel lbl = new JLabel(PluginServices.getText(this,"text"));
132
				addComponent(lbl,
129 133
						txtDefaultText = new JTextField(), GridBagConstraints.BOTH, new Insets(4,0,4,8));
134
				lbl.setToolTipText(i18nManager.getTranslation("text_to_insert_when_non_value_at_field"));
130 135
				panel = AnnotationSwingLocator.getSwingManager().createAnnotationPreferences();
131 136
				addComponent(panel);
132 137
			}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.annotation.app/org.gvsig.annotation.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1 1
# Resource bundle texts for the English language locale (en)
2 2
export_to_annotation=Export to anotation
3

  
3
text_to_insert_when_non_value_at_field=Text to show when some field of the attributes table has no value
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.annotation.app/org.gvsig.annotation.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1 1
# Resource bundle texts for the Spanish language locale (es)
2 2
export_to_annotation=Exportar a anotaciones
3
text_to_insert_when_non_value_at_field=Texto a mostrar cuando alg\u00fan campo de la tabla de atributos no tiene valor

Also available in: Unified diff