Revision 17665 trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/raster/util/Configuration.java

View differences:

Configuration.java
72 72
	 * @return
73 73
	 */
74 74
	static public Boolean getValue(String key, Boolean defaultValue) {
75
		if (singleton.hashMap.get(key) == null)
76
			singleton.hashMap.put(key, defaultValue);
75
		singleton.saveDefaultValue(key, defaultValue);
77 76
		try {
78 77
			return Boolean.valueOf(getXMLEntity().getStringProperty(key));
79 78
		} catch (Exception e) {
......
89 88
	 * @return
90 89
	 */
91 90
	static public Double getValue(String key, Double defaultValue) {
92
		if (singleton.hashMap.get(key) == null)
93
			singleton.hashMap.put(key, defaultValue);
91
		singleton.saveDefaultValue(key, defaultValue);
94 92
		try {
95 93
			return Double.valueOf(getXMLEntity().getStringProperty(key));
96 94
		} catch (Exception e) {
......
106 104
	 * @return
107 105
	 */
108 106
	static public Float getValue(String key, Float defaultValue) {
109
		if (singleton.hashMap.get(key) == null)
110
			singleton.hashMap.put(key, defaultValue);
107
		singleton.saveDefaultValue(key, defaultValue);
111 108
		try {
112 109
			return Float.valueOf(getXMLEntity().getStringProperty(key));
113 110
		} catch (Exception e) {
......
123 120
	 * @return
124 121
	 */
125 122
	static public Integer getValue(String key, Integer defaultValue) {
126
		if (singleton.hashMap.get(key) == null)
127
			singleton.hashMap.put(key, defaultValue);
123
		singleton.saveDefaultValue(key, defaultValue);
128 124
		try {
129 125
			return Integer.valueOf(getXMLEntity().getStringProperty(key));
130 126
		} catch (Exception e) {
......
140 136
	 * @return
141 137
	 */
142 138
	static public Long getValue(String key, Long defaultValue) {
143
		if (singleton.hashMap.get(key) == null)
144
			singleton.hashMap.put(key, defaultValue);
139
		singleton.saveDefaultValue(key, defaultValue);
145 140
		try {
146 141
			return Long.valueOf(getXMLEntity().getStringProperty(key));
147 142
		} catch (Exception e) {
......
157 152
	 * @return
158 153
	 */
159 154
	static public String getValue(String key, String defaultValue) {
160
		if (singleton.hashMap.get(key) == null)
161
			singleton.hashMap.put(key, defaultValue);
155
		singleton.saveDefaultValue(key, defaultValue);
162 156
		try {
163 157
			return getXMLEntity().getStringProperty(key);
164 158
		} catch (Exception e) {
......
168 162
	}
169 163

  
170 164
	/**
165
	 * Guarda el valor por defecto en caso de que no exista
166
	 * @param key
167
	 * @param defaultValue
168
	 */
169
	private void saveDefaultValue(String key, Object defaultValue) {
170
		if (hashMap.get(key) == null)
171
			hashMap.put(key, defaultValue);
172
	}
173

  
174
	/**
171 175
	 * Devuelve el valor por defecto de un key
172 176
	 * @param key
173 177
	 * @return

Also available in: Unified diff