Revision 456
| 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.main/src/main/java/org/gvsig/view3d/main/Main.java | ||
|---|---|---|
| 86 | 86 |
*/ |
| 87 | 87 |
public class Main {
|
| 88 | 88 |
|
| 89 |
private static final Logger logger = LoggerFactory.getLogger(Main.class);
|
|
| 89 |
private static final Logger LOG = LoggerFactory.getLogger(Main.class);
|
|
| 90 | 90 |
|
| 91 | 91 |
final View3DSwingManager view3DManager; |
| 92 | 92 |
|
| ... | ... | |
| 158 | 158 |
mapControl.setTool("pan");
|
| 159 | 159 |
|
| 160 | 160 |
} catch (MapControlCreationException e) {
|
| 161 |
logger.error("Can't create mapControl", e);
|
|
| 161 |
LOG.error("Can't create mapControl", e);
|
|
| 162 | 162 |
} |
| 163 | 163 |
|
| 164 | 164 |
// Create JFrame to show data |
| 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.impl/src/main/java/org/gvsig/view3d/swing/impl/data/DefaultDataRasterReaderFactory.java | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
package org.gvsig.view3d.swing.impl.data; |
| 26 | 26 |
|
| 27 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
|
| 28 |
|
|
| 29 | 27 |
import gov.nasa.worldwind.avlist.AVList; |
| 30 | 28 |
import gov.nasa.worldwind.data.BasicDataRasterReaderFactory; |
| 31 | 29 |
import gov.nasa.worldwind.data.DataRasterReader; |
| 32 |
import gov.nasa.worldwind.util.Logging; |
|
| 33 | 30 |
|
| 31 |
import org.slf4j.Logger; |
|
| 32 |
import org.slf4j.LoggerFactory; |
|
| 33 |
|
|
| 34 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
|
| 35 |
|
|
| 34 | 36 |
/** |
| 35 | 37 |
* @author <a href="mailto:lmarques@disid.com">Lluis Marques</a> |
| 36 | 38 |
* |
| 37 | 39 |
*/ |
| 38 | 40 |
public class DefaultDataRasterReaderFactory extends |
| 39 | 41 |
BasicDataRasterReaderFactory {
|
| 42 |
|
|
| 43 |
private static final Logger LOG = |
|
| 44 |
LoggerFactory.getLogger(DefaultDataRasterReaderFactory.class); |
|
| 40 | 45 |
|
| 41 | 46 |
/** {@inheritDoc} */
|
| 42 | 47 |
public DataRasterReader findReaderFor(Object source, AVList params) {
|
| 43 | 48 |
if (source == null) {
|
| 44 |
String message = Logging.getMessage("nullValue.SourceIsNull");
|
|
| 45 |
Logging.logger().severe(message); |
|
| 46 |
throw new IllegalArgumentException(message); |
|
| 49 |
LOG.error("Can't find reader because source is null");
|
|
| 50 |
throw new IllegalArgumentException(); |
|
| 47 | 51 |
} |
| 48 | 52 |
|
| 49 | 53 |
if (source instanceof FLayer) {
|
| ... | ... | |
| 59 | 63 |
DataRasterReader[] readers) {
|
| 60 | 64 |
|
| 61 | 65 |
if (source == null) {
|
| 62 |
String message = Logging.getMessage("nullValue.SourceIsNull");
|
|
| 63 |
Logging.logger().severe(message); |
|
| 64 |
throw new IllegalArgumentException(message); |
|
| 66 |
LOG.error("Can't find reader because source is null");
|
|
| 67 |
throw new IllegalArgumentException(); |
|
| 65 | 68 |
} |
| 66 | 69 |
|
| 67 | 70 |
if (source instanceof FLayer) {
|
| 2.1/trunk/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.impl/src/main/java/org/gvsig/view3d/swing/impl/DefaultMapControl3D.java | ||
|---|---|---|
| 77 | 77 |
|
| 78 | 78 |
private static final long serialVersionUID = 2024899922367896097L; |
| 79 | 79 |
|
| 80 |
private static final Logger logger = LoggerFactory
|
|
| 80 |
private static final Logger LOG = LoggerFactory
|
|
| 81 | 81 |
.getLogger(DefaultMapControl3D.class); |
| 82 | 82 |
|
| 83 | 83 |
/** |
| ... | ... | |
| 115 | 115 |
try {
|
| 116 | 116 |
addLayers(); |
| 117 | 117 |
} catch (BaseException e) {
|
| 118 |
logger.info("Can't add MapControl layers", e);
|
|
| 118 |
LOG.info("Can't add MapControl layers", e);
|
|
| 119 | 119 |
} |
| 120 | 120 |
|
| 121 | 121 |
} |
| ... | ... | |
| 303 | 303 |
addWWLayer(SkyColorLayer.class); |
| 304 | 304 |
} |
| 305 | 305 |
} catch (Exception e) {
|
| 306 |
logger.warn(
|
|
| 306 |
LOG.warn(
|
|
| 307 | 307 |
"Can't add " + SkyGradientLayer.class.getCanonicalName() |
| 308 | 308 |
+ " or " + SkyColorLayer.class.getCanonicalName() + " to " |
| 309 | 309 |
+ getWwd().getModel().toString(), e); |
| ... | ... | |
| 314 | 314 |
try {
|
| 315 | 315 |
addWWLayer(WorldMapLayer.class); |
| 316 | 316 |
} catch (Exception e) {
|
| 317 |
logger.warn("Can't add " + WorldMapLayer.class.getCanonicalName()
|
|
| 317 |
LOG.warn("Can't add " + WorldMapLayer.class.getCanonicalName()
|
|
| 318 | 318 |
+ "to " + getWwd().getModel().toString(), e); |
| 319 | 319 |
} |
| 320 | 320 |
} |
| ... | ... | |
| 323 | 323 |
try {
|
| 324 | 324 |
addWWLayer(CompassLayer.class); |
| 325 | 325 |
} catch (Exception e) {
|
| 326 |
logger.warn("Can't add " + CompassLayer.class.getCanonicalName()
|
|
| 326 |
LOG.warn("Can't add " + CompassLayer.class.getCanonicalName()
|
|
| 327 | 327 |
+ " to " + getWwd().getModel().toString(), e); |
| 328 | 328 |
} |
| 329 | 329 |
} |
| ... | ... | |
| 332 | 332 |
try {
|
| 333 | 333 |
addWWLayer(ScalebarLayer.class); |
| 334 | 334 |
} catch (Exception e) {
|
| 335 |
logger.warn("Can't add " + ScalebarLayer.class.getCanonicalName()
|
|
| 335 |
LOG.warn("Can't add " + ScalebarLayer.class.getCanonicalName()
|
|
| 336 | 336 |
+ " to " + getWwd().getModel().toString(), e); |
| 337 | 337 |
} |
| 338 | 338 |
} |
| ... | ... | |
| 341 | 341 |
try {
|
| 342 | 342 |
addWWLayer(StarsLayer.class); |
| 343 | 343 |
} catch (Exception e) {
|
| 344 |
logger.warn("Can't add " + StarsLayer.class.getCanonicalName()
|
|
| 344 |
LOG.warn("Can't add " + StarsLayer.class.getCanonicalName()
|
|
| 345 | 345 |
+ " to " + getWwd().getModel().toString(), e); |
| 346 | 346 |
} |
| 347 | 347 |
} |
Also available in: Unified diff