/ - Diff - | gvSIG desktop 1 - gvSIG

     		//Metadata m = layer.getMetadata();
     		ExtendedMetadata auxMD = createMD4Test();
     		System.out.println(auxMD);
     		// -----------------------------------------------------------------------------
     		Iterator it = auxMD.iterator();

     public class MDElementDefinition {
     	private String name;
     	private Enum type;
     	private MDType type;
     	private Boolean required;
     	private Object defaultValue;
     	private String description;
     	private Map synonyms = new HashMap();
     	private Map<String, Object> synonyms = new HashMap<String, Object>();
     	public MDElementDefinition() {}
     	public MDElementDefinition(String name, Enum type, Boolean required, Object defaultValue, String description) {
     	public MDElementDefinition(String name, MDType type, Boolean required, Object defaultValue, String description) {
     		this.name = name;
     		this.type = type;
     		this.required = required;
-...
     		return this.name;
+    	}
     	public Enum getType() {
     	public MDType getType() {
     		return this.type;
+    	}
-...
     		this.name = name;
+    	}
     	public void setType(Enum type) {
     	public void setType(MDType type) {
     		this.type = type;
+    	}

     	 * Retrieves the father of the Metadata object, or null if it doesn't have.
     	 * @return			a ExtendedMetadata object or null
     	 */
     	public ExtendedMetadata getFather();
     	public Object getFather();
     	/**
     	 * Changes the identifier of the object
-...
     	 * Changes father of the object
     	 * @param 	father	the new father value of the MDElement object
     	 */
     	public void setFather(ExtendedMetadata father);
     	public void setFather(Object father);
     	/**
     	 * Checks if the ExtendedMetadata has father

     public class MDElementImpl implements MDElement{
     	private String id;
     	private String name = "";
     	private Object value;
     	private MDElementDefinition type;
     	private MDElementDefinition type = null;
     	private Locale locale;
     	private ExtendedMetadata father;
     	private Object father;
     	public MDElementImpl() {}
-...
     		this.locale = locale;
+    	}
     	public MDElementImpl(Object value, String name, Locale locale) {
     		//this.id = id; Que poner como ID???
     		this.value = value;
     		this.name = name;
     		this.locale = locale;
+    	}
     	public String getId() {
     		return this.id;
+    	}
-...
+    	}
     	public String getName() {
     		return this.type.getName();
     		if(this.type != null)
     			return this.type.getName();
     		return this.name;
+    	}
     	public void setName(String name) {
-...
     	/**
     	 * @return the father
     	 */
     	public ExtendedMetadata getFather() {
     	public Object getFather() {
     		return father;
+    	}
     	/**
     	 * @param father the father to set
     	 */
     	public void setFather(ExtendedMetadata father) {
     	public void setFather(Object father) {
     		this.father = father;
+    	}
-...
     	public int getLevel() {
     		if(!this.hasFather())
     			return 0;
     		else
     			return 1 + this.getFather().getLevel();
     		else {
     			if(getFather() instanceof MDElement)
     				return 1 + ((MDElement)this.getFather()).getLevel();
     			else if(getFather() instanceof ExtendedMetadata)
     				return 1 + ((ExtendedMetadata)this.getFather()).getLevel();
     			else
     				return 0;
+    		}
+    	}
     	public String toString() {
     		String aux = "<" + getName() + ">";
     		aux += value.toString();
     		aux += "</" + getName() + ">";
     		return aux;
+    	}
+    }

     	private Date changeDate;
     	private MDDefinition type;
     	private String author;
     	private Map<String, Object> elements = new LinkedHashMap<String, Object>();
     	// Obligar a que el segundo elemento sea MDElement??? Habria que cambiar las funciones set.
     	private Map<String, MDElement> elements = new LinkedHashMap<String, MDElement>();
     	private ExtendedMetadata father;
-...
     	public Object get(String name) throws NamedMetadataNotFoundException {
     		if(!hasValue(name))
     			throw new NamedMetadataNotFoundException(this.getClass());
     		return elements.get(name);
     		return ((MDElement) elements.get(name)).getValue();
+    	}
     	public boolean getBoolean(String name) throws ClassCastException, NamedMetadataNotFoundException {
-...
+    	}
     	public void set(String name, Object value) {
     		//if (compareToIgnoreCase(value.getClass, "class org.gvsig.metadata.extended.manager.ExtendedMetadataImpl"))
     		elements.put(name, value);
     		if(value instanceof Boolean)
     			setBoolean(name, (Boolean)value);
     		else if(value instanceof Date)
     			setDate(name, (Date)value);
     		else if(value instanceof Double)
     			setDouble(name, (Double)value);
     		else if(value instanceof Integer)
     			setInt(name, (Integer)value);
     		else if(value instanceof String)
     			setString(name, (String)value);
     		else {
     			MDElement mde = new MDElementImpl(value, name, null);
     			elements.put(name, mde);
+    		}
+    	}
     	public void setBoolean(String name, boolean value) {
     		MDElement mde = new MDElementImpl(Boolean.valueOf(value), null, null);
     		MDElement mde = new MDElementImpl(Boolean.valueOf(value), name, null);
     		elements.put(name, mde);
     		mde.setFather(this);
+    	}
     	public void setDate(String name, Date value) {
     		MDElement mde = new MDElementImpl(value, null, null);
     		MDElement mde = new MDElementImpl(value, name, null);
     		elements.put(name, mde);
     		mde.setFather(this);
+    	}
     	public void setDouble(String name, double value) {
     		MDElement mde = new MDElementImpl(Double.valueOf(value), null, null);
     		MDElement mde = new MDElementImpl(Double.valueOf(value), name, null);
     		elements.put(name, mde);
     		mde.setFather(this);
+    	}
     	public void setInt(String name, int value) {
     		MDElement mde = new MDElementImpl(Integer.valueOf(value), null, null);
     		MDElement mde = new MDElementImpl(Integer.valueOf(value), name, null);
     		elements.put(name, mde);
     		mde.setFather(this);
+    	}
     	public void setString(String name, String value) {
     		MDElement mde = new MDElementImpl(value, null, null);
     		MDElement mde = new MDElementImpl(value, name, null);
     		elements.put(name, mde);
     		mde.setFather(this);
+    	}
-...
     		return elements.entrySet().iterator();
+    	}
     	public String toString() {
     		String aux = "<MD_Metadata>";
     		Iterator it = iterator();
     		while (it.hasNext()) {
     			Map.Entry e = (Map.Entry)it.next();
     			aux += e.getValue().toString();
+    		}
     		aux += "</MD_Metadata>";
     		return aux;
+    	}
+    }

     	public H2Persistence() {
     		try {
     			Class.forName("org.h2.Driver");
     			conn = DriverManager.getConnection("jdbc:h2:~/extMetadata", "gvsig", "metadata");
     		} catch (Exception e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
     			try {
     				Class.forName("org.h2.Driver");
     				conn = DriverManager.getConnection("jdbc:h2:~/extMetadata", "gvsig", "metadata");
     			} catch (ClassNotFoundException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
     			} catch (SQLException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
+    	}

| gvSIG desktop 1

Revision 24243