/ - Diff - Application: gvSIG desktop - gvSIG

Revision 42877

              * Flag to set the layer as a temporary layer.
              */
             private boolean temporary;
     	/**
     	 * Path to the upper layer which this layer belongs.
+    	 *
-...
     	 */
     	private long drawVersion= 0L;
             private ExtendedPropertiesHelper properties = new ExtendedPropertiesHelper();
     	public FLyrDefault(MetadataContainer metadataContainer) {
     		this.metadataContainer = metadataContainer;
+    	}
-...
     			this.updateDrawVersion();
+    		}
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#getMapContext()
-...
                    } catch (Exception ex) {
                        logger.warn("Error calling listener '"+listener.toString()+"'.", ex);
+                   }
+               }
+               }
+    	}
     	/**
     	 * Called by the method {@linkplain #setName(String)}. Notifies all listeners associated to this layer,
-...
                    } catch (Exception ex) {
                        logger.warn("Error calling listener '"+listener.toString()+"'.", ex);
+                   }
+               }
+               }
+    	}
     	/**
-...
                    } catch (Exception ex) {
                        logger.warn("Error calling listener '"+listener.toString()+"'.", ex);
+                   }
+               }
+               }
+    	}
     	/**
-...
                    } catch (Exception ex) {
                        logger.warn("Error calling listener '"+listener.toString()+"'.", ex);
+                   }
+               }
+               }
+            }
     	/*
     	 * (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#isEditing()
-...
     	public String getTocImageIcon() {
     		return "layer-icon";
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#isInTOC()
-...
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#reload()
     	 */
     	public void reload() throws ReloadLayerException {
     	    if(this.ct!=null){
     	        IProjection srcProj = this.ct.getPOrig();
     	        if(!this.getProjection().equals(srcProj)){
     	            this.ct = this.getProjection().getCT(this.ct.getPDest());
+    	        }
+    	    }
     		this.setAvailable(true);
+    	}
-...
     	public void addError(BaseException exception){
     		status.addLayerError(exception);
+    	}
             @Override
             public void setError(Exception ex) {
                 this.status.setLayerError(ex);
+            }
     	/*
     	 * (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#visibleRequired()
-...
     	public void visibilityChanged(LayerEvent e) {
+    	}
     	// ========================================================
     	public void saveToState(PersistentState state) throws PersistenceException {
                 try {
     		state.set("parentLayer", (Persistent)parentLayer);
-...
                 try {
     		this.setDynValue(METADATA_NAME, state.getString("name"));
     		this.setDynValue(METADATA_CRS, state.get("crs"));
     		this.parentLayer = (FLayers) state.get("parentLayer");
     		this.status = (FLayerStatus) state.get("status");
     		this.minScale = state.getDouble("minScale");
-...
     				FLyrDefault.class,
     				"FLyrDefault",
     				"FLyrDefault Persistence definition",
     				null,
     				null,
     				null
     		);
     		definition.addDynFieldString("name").setMandatory(false);
-...
     		definition.addDynFieldObject("status").setClassOfValue(FLayerStatus.class).setMandatory(true);
                     definition.addDynFieldMap("properties").setClassOfItems(Object.class)
     				.setMandatory(true);
                 return Boolean.TRUE;
+            }
+        }
     //	/**
     //	 * Splits string into an array of strings
     //	 * @param input input string
-...
     //	public static String[] splitString(String input, String sep) {
     //		return Pattern.compile(sep).split(input, 0);
     //	}
     	public void clear() {
     		if (metadataContainer != null) {
     			metadataContainer.clear();
+    		}
+    	}
         public String getMetadataName() throws MetadataException {
             return FLayer.METADATA_DEFINITION_NAME;
+        }
             public static class RegisterMetadata implements Callable {
                 public Object call() {
-...
     	public String toString() {
     		return this.getName();
+    	}
     	public boolean hidesThisArea(Envelope area) {
     		return false;
+    	}
             public boolean isTemporary() {
                 return this.temporary;
+            }
             public void setTemporary(boolean temporary) {
                 this.temporary = temporary;
+            }

     import org.gvsig.fmap.dal.DataStore;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.fmap.dal.exception.ReadRuntimeException;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureQuery;
     import org.gvsig.fmap.dal.feature.FeatureSet;
-...
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.evaluator.Evaluator;
     import org.gvsig.tools.exception.BaseException;
     import org.gvsig.tools.exception.BaseRuntimeException;
     import org.gvsig.tools.locator.LocatorException;
     import org.gvsig.tools.observer.Observable;
     import org.gvsig.tools.observer.Observer;
-...
             // Si existe reproyecci?n, reproyectar el extent
             ICoordTrans ct = getCoordTrans();
             if (ct != null) {
                 boolean originalEnvelopeIsEmpty = rAux.isEmpty();
                 rAux = rAux.convert(ct);
                 if(!originalEnvelopeIsEmpty && rAux.isEmpty()){
                     try {
                         this.setAvailable(false);
                         throw new EnvelopeCantBeInitializedException();
                     } catch(EnvelopeCantBeInitializedException e){
                         this.addError(e);
+                    }
+                }
+            }
             return rAux;
-...
         public Iterator iterator() {
             return this.getFeatureStore().iterator();
+        }
         protected class EnvelopeCantBeInitializedException extends BaseException {
             /**
+             *
              */
             private static final long serialVersionUID = 4572797479347381552L;
             private final static String MESSAGE_FORMAT = "The envelope can't be initialized, maybe the layer has a wrong projection. Change the projection in layer properties of the add layer dialog to try fix it.";
             private final static String MESSAGE_KEY = "_EnvelopeCantBeInitializedException";
             public EnvelopeCantBeInitializedException() {
                 super(MESSAGE_FORMAT, null, MESSAGE_KEY, serialVersionUID);
+            }
+        }
+    }

                     } catch (Exception e) {
                         LayerErrorsPanel panel = new LayerErrorsPanel(layerName, e);
                         if (preparedLayer != null) {
                             panel.setLayer(preparedLayer);
                         } else if(layer!=null){
                             panel.setLayer(layer);
+                        }
                         I18nManager i18nManager = ToolsLocator.getI18nManager();
                         ToolsSwingLocator.getWindowManager().showWindow(
                             panel,

Also available in: Unified diff