Addition of pre-defined constants. Those constants will be replaced by entries in an embedded
+database for the Apache SIS project. The metadata-sql module can handle this task.
Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r11095:11096 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/ResponsiblePartyImpl.java| Revision 11095 | Revision 11096 |
|---|---|
package org.geotools.metadata.citation; + +// OpenGIS dependencies +import org.geotools.metadata.MetadataEntity; +import org.geotools.resources.Utilities; +import org.geotools.util.SimpleInternationalString; +import org.opengis.metadata.citation.Contact; +import org.opengis.metadata.citation.Role; +import org.opengis.util.InternationalString; |
+package org.geotools.metadata.citation; + +// OpenGIS dependencies +import java.net.MalformedURLException; +import java.net.URL; + +import org.geotools.metadata.MetadataEntity; +import org.geotools.resources.Utilities; +import org.geotools.util.SimpleInternationalString; +import org.opengis.metadata.citation.Address; +import org.opengis.metadata.citation.Contact; +import org.opengis.metadata.citation.OnLineFunction; +import org.opengis.metadata.citation.OnLineResource; +import org.opengis.metadata.citation.Role; +import org.opengis.metadata.citation.Telephone; +import org.opengis.util.InternationalString; |
private static final long serialVersionUID = -2477962229031486552L;
+
+/**
+ * The <A HREF="http://www.opengis.org">OpenGIS consortium</A> responsible party.
+ *
+ * @see org.geotools.metadata.citation.Contact#OPEN_GIS
+ *
+ * @todo Localize.
+ */
+public static ResponsibleParty OPEN_GIS = new ResponsibleParty(Role.PRINCIPAL_INVESTIGATOR);
+static {
+ OPEN_GIS.setOrganisationName(new SimpleInternationalString("OpenGIS consortium")); |
+private static final long serialVersionUID = -2477962229031486552L; + +/** + * Create a a ResonsibleParty metadata entry for OGC involvemnt. + * <p> + * TODO: limited to package visability waiting for Martin okay + * </p> + * @param role + * @param function + * @param onlineResource + * @return ResponsibleParty describing OGC involvement + */ +static ResponsibleParty ogc( Role role, OnLineFunction function, URL onlineResource ){ + org.geotools.metadata.citation.OnLineResource resource = new org.geotools.metadata.citation.OnLineResource(); + + resource.setLinkage( onlineResource ); + resource.setFunction( function ); + resource.freeze(); + + org.geotools.metadata.citation.Contact contact = new org.geotools.metadata.citation.Contact(); + contact.setOnLineResource( resource ); + contact.freeze(); + + ResponsibleParty ogc = new ResponsibleParty( role ); + ogc.setOrganisationName(new SimpleInternationalString("Open Geospatial Consortium")); + ogc.setContactInfo( contact ); + ogc.freeze(); + + return ogc; +} + +/** + * The <A HREF="http://www.opengis.org">OpenGIS consortium</A> responsible party. + * + * @see org.geotools.metadata.citation.Contact#OPEN_GIS + * + * @todo Localize. + */ +public static ResponsibleParty OGC = new ResponsibleParty(Role.RESOURCE_PROVIDER); +static { + OGC.setOrganisationName(new SimpleInternationalString("Open Geospatial Consortium")); + OGC.setContactInfo(org.geotools.metadata.citation.Contact.OGC); + OGC.freeze(); +} + +/** + * The <A HREF="http://www.opengis.org">OpenGIS consortium</A> responsible party. + * + * @see org.geotools.metadata.citation.Contact#OPEN_GIS + * + * @todo Localize. + */ +public static ResponsibleParty OPEN_GIS = new ResponsibleParty(Role.PRINCIPAL_INVESTIGATOR); +static { + OPEN_GIS.setOrganisationName(new SimpleInternationalString("OpenGIS consortium")); |
| Author: | jgarnett |
| Date: | 2005-02-04 |
| Message: | Updated AUTO, AUTO2 and EPSG metadata with appropriate identifier and contact info |
Those resources will need to be omitted.
+Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20597:20598 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/i18n/Errors.properties| Revision 20597 | Revision 20598 |
|---|---|
CANT_CONVERT_FROM_TYPE_$1=Can't convert value from type '{0}'.
+CANT_CREATE_FACTORY_$1=Can't create a factory of type "{0}".
+CANT_CREATE_FROM_TEXT_$1=Can't create object of type '{0}' from a text.
+CANT_GET_DATASOURCE_$1=Failed to get the data source for name "{0}".
+CANT_EVALUATE_$1=Can't evaluate a value for coordinate ({0}).
+CANT_READ_$1=Can't read file "{0}". |
+CANT_CONVERT_FROM_TYPE_$1=Can't convert value from type '{0}'.
+CANT_CREATE_FACTORY_$1=Can't create a factory of type "{0}".
+CANT_CREATE_FROM_TEXT_$1=Can't create object of type '{0}' from a text.
+CANT_CROP_$1="{0}" parameter should be not nul and of type "{1}".
+CANT_CROP_$2=CRS of crop envelope must be the same CRS of the source coverage.
+CANT_CROP_$3=An error occurred while cropping.
+CANT_GET_DATASOURCE_$1=Failed to get the data source for name "{0}".
+CANT_EVALUATE_$1=Can't evaluate a value for coordinate ({0}).
+CANT_READ_$1=Can't read file "{0}". |
CANT_REPROJECT_$1=Can't reproject grid coverage "{0}".
+CANT_SEPARATE_CRS_$1=Can't separate CRS "{0}".
+CANT_SET_PARAMETER_VALUE_$1=Can't set a value to the parameter "{0}".
+CANT_TRANSFORM_ENVELOPE=Can't transform envelope.
+CANVAS_NOT_OWNER_$1=Graphic "{0}" is owned by an other canvas.
+COLINEAR_AXIS_$2=Axis {0} and {1} are colinear. |
+CANT_REPROJECT_$1=Can't reproject grid coverage "{0}".
+CANT_SEPARATE_CRS_$1=Can't separate CRS "{0}".
+CANT_SET_PARAMETER_VALUE_$1=Can't set a value to the parameter "{0}".
+CANT_SCALE_$1=Scaling affine transform is not invertible.
+CANT_TRANSFORM_ENVELOPE=Can't transform envelope.
+CANVAS_NOT_OWNER_$1=Graphic "{0}" is owned by an other canvas.
+COLINEAR_AXIS_$2=Axis {0} and {1} are colinear. |
| Author: | simboss |
| Date: | 2006-07-18 |
| Message: | -committing first bunch of changes from the coverage branch. Modules involved are*api *referencing *coverage *main *renderer *shaperenderer |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/Citations.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2005, Geotools Project Managment Committee (PMC) + * (C) 2005, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2005-2006, GeoTools Project Managment Committee (PMC) + * (C) 2005, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/AddressImpl.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2004, Geotools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2004-2006, GeoTools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/CitationImpl.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2004, Geotools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2004-2006, GeoTools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/CitationDateImpl.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2005, Geotools Project Managment Committee (PMC) + * (C) 2005, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2005-2006, GeoTools Project Managment Committee (PMC) + * (C) 2005, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/ContactImpl.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2004, Geotools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2004-2006, GeoTools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/OnLineResourceImpl.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2004, Geotools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2004-2006, GeoTools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/ResponsiblePartyImpl.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2004, Geotools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2004-2006, GeoTools Project Managment Committee (PMC) + * (C) 2004, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * This package contains documentation from OpenGIS specifications. + * OpenGIS consortium's work is fully acknowledged here. + */ |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/i18n/Errors.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2003, Geotools Project Management Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2003-2006, Geotools Project Managment Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package org.geotools.resources.i18n; |
+* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ +package org.geotools.resources.i18n; |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/i18n/Errors.properties| Revision 20873 | Revision 20874 |
|---|---|
AMBIGIOUS_AXIS_LENGTH=Ambiguous axis length.
+ANGLE_OVERFLOW_$1=Angle {0} is too high.
+ANTIPODE_LATITUDES_$2=Latitudes {0} and {1} are opposite. |
+# (C) 2003-2006, Geotools Project Managment Committee (PMC)
+AMBIGIOUS_AXIS_LENGTH=Ambiguous axis length.
+ANGLE_OVERFLOW_$1=Angle {0} is too high.
+ANTIPODE_LATITUDES_$2=Latitudes {0} and {1} are opposite. |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/i18n/Errors_fr.properties| Revision 20873 | Revision 20874 |
|---|---|
AMBIGIOUS_AXIS_LENGTH=Les longueurs des axes sont ambiguës.
+ANGLE_OVERFLOW_$1=L'angle {0} est trop élevé.
+ANTIPODE_LATITUDES_$2=Les latitudes {0} et {1} sont aux antipodes. |
+# (C) 2003-2006, Geotools Project Managment Committee (PMC)
+AMBIGIOUS_AXIS_LENGTH=Les longueurs des axes sont ambiguës.
+ANGLE_OVERFLOW_$1=L'angle {0} est trop élevé.
+ANTIPODE_LATITUDES_$2=Les latitudes {0} et {1} sont aux antipodes. |
| Author: | jgarnett |
| Date: | 2006-08-07 |
| Message: | ip review |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/IndexedResourceBundle.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2003, Geotools Project Managment Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2003-2006, Geotools Project Managment Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package org.geotools.resources; |
+* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ +package org.geotools.resources; |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/resources/IndexedResourceCompiler.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2003, Geotools Project Managment Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2003-2006, Geotools Project Managment Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package org.geotools.resources; |
+* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ +package org.geotools.resources; |
final File file = new File(fullname.replace('.', '/') + ".java");
+final BufferedWriter out = new BufferedWriter(new FileWriter(file));
+out.write("/*\n" +
+ " * Geotools - OpenSource mapping toolkit\n" +
+ " * (C) 2003, Geotools Project Managment Committee (PMC)\n" +
+ " *\n" +
+ " * THIS IS AN AUTOMATICALLY GENERATED FILE. DO NOT EDIT!\n" +
+ " * Generated with: org.geotools.resources.ResourceCompiler\n" +
+ " */\n"); |
+final File file = new File(fullname.replace('.', '/') + ".java");
+final BufferedWriter out = new BufferedWriter(new FileWriter(file));
+out.write("/*\n" +
+ " * GeoTools - OpenSource mapping toolkit\n" +
+ " * http://geotools.org\n" +
+ " * (C) 2003-2006, Geotools Project Managment Committee (PMC)\n" +
+ " *\n" +
+ " * This library is free software; you can redistribute it and/or\n" +
+ " * modify it under the terms of the GNU Lesser General Public\n" +
+ " * License as published by the Free Software Foundation; either\n" +
+ " * version 2.1 of the License, or (at your option) any later version.\n" +
+ " * \n" +
+ " * This library is distributed in the hope that it will be useful,\n" +
+ " * but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
+ " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +
+ " * Lesser General Public License for more details.\n" +
+ " * \n" +
+ " * THIS IS AN AUTOMATICALLY GENERATED FILE. DO NOT EDIT!\n" +
+ " * Generated with: org.geotools.resources.ResourceCompiler\n" +
+ " */\n"); |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/ModifiableMetadata.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools2 - OpenSource mapping toolkit + * http://geotools.org + * (C) 2002, Geotools Project Managment Committee (PMC) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2004-2006, GeoTools Project Managment Committee (PMC) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public |
Changes in GeoTools header only. The removal of the "or (at your option) any later version" clause +must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing. +This header does not apply to Apache SIS, since the above-cited contributions are omitted.
+Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/util/Utilities.java| Revision 20873 | Revision 20874 |
|---|---|
/* + * Geotools 2 - OpenSource mapping toolkit + * (C) 2003, Geotools Project Managment Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
+/* + * GeoTools - OpenSource mapping toolkit + * http://geotools.org + * (C) 2003-2006, Geotools Project Managment Committee (PMC) + * (C) 2001, Institut de Recherche pour le Développement + * + * This library is free software; you can redistribute it and/or |
* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package org.geotools.resources; |
+* but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ +package org.geotools.resources; |
| Author: | chorner |
| Date: | 2007-03-20 |
| Message: | synchronization with GEO-95 changes |
The method added by this commit basically duplicates the toString() method of
+ standard Java collection. It also contains a mysterious call to Iterator.remove()
+ at the iteration end. This method has not been keep in Geotk.
Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24819:24820 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/ModifiableMetadata.java| Revision 24819 | Revision 24820 |
|---|---|
buffer.append(System.getProperty("line.separator", "\n"));
+ }
+ }
+} |
+ buffer.append(System.getProperty("line.separator", "\n"));
+ }
+ }
+
+ /**
+ * Add the contents of a collection to the provided buffer.
+ * This convenience method is used for {@link #toString) implementations.
+ * Output will be: "label: [1,2,3]"
+ *
+ * @param buffer string buffer to add the collection contents to
+ * @param label label for easy identification
+ * @param collection source object
+ */
+ protected static void appendCollection(final StringBuffer buffer, String label, Collection collection) {
+ buffer.append(label);
+ buffer.append(": [");
+ if (collection != null && !collection.isEmpty()) {
+ Iterator it = collection.iterator();
+ while (it.hasNext()) {
+ buffer.append(it.next().toString());
+ if (it.hasNext()) {
+ buffer.append(",");
+ }
+ }
+ it.remove();
+ it = null;
+ }
+ buffer.append("]");
+ }
+} |
There is no code addition in this commit, only code commented-out. This commit has been reverted in Geotk
+by uncommenting the code, then reorganizing the various Citations methods
+(titleMatches, identifierMatches and getIdentifier).
Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24867:24868 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/Citations.java| Revision 24867 | Revision 24868 |
|---|---|
return identifierMatches(c2, c1); + } +} +final Collection types2 = c2.getIdentifierTypes(); +final Iterator types1_iter = c1.getIdentifierTypes().iterator(); +do { + /* + * If there is no more identifier types to compare, delegates to the + * identifierMatches(Citation, String) method (which doesn't take in + * account any identifier type, but may inspect titles if c2 doesn't + * have any identifier). + */ + final String identifier1 = ((String) ids1_iter.next()).trim(); + if (!types1_iter.hasNext() || types2.isEmpty()) { + if (identifierMatches(c2, identifier1)) { + return true; |
+return identifierMatches(c2, c1); + } +} + + +//final Collection types2 = c2.getIdentifierTypes(); +//final Iterator types1_iter = c1.getIdentifierTypes().iterator(); +do { + + // If there is no more identifier types to compare, delegates to the + // identifierMatches(Citation, String) method (which doesn't take in + // account any identifier type, but may inspect titles if c2 doesn't + // have any identifier). + + final String identifier1 = ((String) ids1_iter.next()).trim(); + /* + if (!types1_iter.hasNext() || types2.isEmpty()) { + if (identifierMatches(c2, identifier1)) { + return true; |
continue; + } + } + /* + * Iterates through all identifiers in order to performs the comparaisons. It would + * have been more efficient to use Collection.contains (especially if the collection + * is actually a HashSet), but we want the comparaisons to be case-insensitive. We + * also want to compare the identifiers only if their types match (except if there + * is no type information). + */ + final String type1 = ((String) types1_iter.next()).trim(); + final Iterator types2_iter = types2.iterator(); + final Iterator ids2_iter = identifiers2.iterator(); + while (ids2_iter.hasNext()) { + final String identifier2 = ((String) ids2_iter.next()).trim(); + if (types2_iter.hasNext()) { + final String type2 = ((String) types2_iter.next()).trim(); + if (!type1.equalsIgnoreCase(type2)) { + continue; + } + } + if (identifier1.equalsIgnoreCase(identifier2)) { + return true; + } + } + } while (ids1_iter.hasNext()); + return false; +} |
+continue; + } + } + */ + // Iterates through all identifiers in order to performs the comparaisons. It would + // have been more efficient to use Collection.contains (especially if the collection + // is actually a HashSet), but we want the comparaisons to be case-insensitive. We + // also want to compare the identifiers only if their types match (except if there + // is no type information). + + //final String type1 = ((String) types1_iter.next()).trim(); + //final Iterator types2_iter = types2.iterator(); + final Iterator ids2_iter = identifiers2.iterator(); + while (ids2_iter.hasNext()) { + final String identifier2 = ((String) ids2_iter.next()).trim(); +// if (types2_iter.hasNext()) { +// final String type2 = ((String) types2_iter.next()).trim(); +// if (!type1.equalsIgnoreCase(type2)) { +// continue; +// } +// } + if (identifier1.equalsIgnoreCase(identifier2)) { + return true; + } + } + } while (ids1_iter.hasNext()); + + return false; + } |
| Author: | jgarnett |
| Date: | 2007-03-22 |
| Message: | clean up metadata and referencing in response to GEO-93 |
Deprecation of a method. The deprecated method has been removed in Geotk.
+ +Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24867:24990 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/CitationImpl.java| Revision 24867 | Revision 24990 |
|---|---|
/** + * Reference form of the unique identifier (ID). Example: Universal Product Code (UPC), + * National Stock Number (NSN). + */ +private Collection identifierTypes; |
+/** + * Reference form of the unique identifier (ID). Example: Universal Product Code (UPC), + * National Stock Number (NSN). + * + * @deprecated + */ +private Collection identifierTypes; |
setEdition (source.getEdition());
+setEditionDate (source.getEditionDate());
+setIdentifiers (source.getIdentifiers());
+setIdentifierTypes (source.getIdentifierTypes());
+setCitedResponsibleParties(source.getCitedResponsibleParties());
+setPresentationForm (source.getPresentationForm());
+setSeries (source.getSeries()); |
+setEdition (source.getEdition()); +setEditionDate (source.getEditionDate()); +setIdentifiers (source.getIdentifiers()); +setCitedResponsibleParties(source.getCitedResponsibleParties()); +setPresentationForm (source.getPresentationForm()); +setSeries (source.getSeries()); |
/**
+ * Returns the reference form of the unique identifier (ID).
+ * Example: Universal Product Code (UPC), National Stock Number (NSN).
+ */
+public synchronized Collection getIdentifierTypes() {
+ return identifierTypes = nonNullCollection(identifierTypes, String.class); |
+/** + * Returns the reference form of the unique identifier (ID). + * Example: Universal Product Code (UPC), National Stock Number (NSN). + * + * @deprecated IdentifierType removed from ISO 19115 + */ +public synchronized Collection getIdentifierTypes() { + return identifierTypes = nonNullCollection(identifierTypes, String.class); |
/**
+ * Set the reference form of the unique identifier (ID).
+ * Example: Universal Product Code (UPC), National Stock Number (NSN).
+ */
+public synchronized void setIdentifierTypes(final Collection newValues) {
+ identifierTypes = copyCollection(newValues, identifierTypes, String.class); |
+/** + * Set the reference form of the unique identifier (ID). + * Example: Universal Product Code (UPC), National Stock Number (NSN). + * + * @deprecated IdentifierType removed from ISO 19115 + */ +public synchronized void setIdentifierTypes(final Collection newValues) { + identifierTypes = copyCollection(newValues, identifierTypes, String.class); |
Utilities.equals(this.edition, that.edition ) &&
+ (this.editionDate == that.editionDate ) &&
+Utilities.equals(this.identifiers, that.identifiers ) &&
+Utilities.equals(this.identifierTypes, that.identifierTypes ) &&
+Utilities.equals(this.citedResponsibleParties, that.citedResponsibleParties) &&
+Utilities.equals(this.presentationForm, that.presentationForm ) &&
+Utilities.equals(this.otherCitationDetails, that.otherCitationDetails ) && |
+Utilities.equals(this.edition, that.edition ) && + (this.editionDate == that.editionDate ) && +Utilities.equals(this.identifiers, that.identifiers ) && +Utilities.equals(this.citedResponsibleParties, that.citedResponsibleParties) && +Utilities.equals(this.presentationForm, that.presentationForm ) && +Utilities.equals(this.otherCitationDetails, that.otherCitationDetails ) && |
Addition of a "name" attribute with corresponding getter and setter methods.
+There is no way to write this contribution differently if we follow the pattern used by all
+other metadata properties: this is basically a copy-and-paste of any existing property with
+only the attribute name changed, and the attribute name is enforced by the ISO 19115 standard.
+Even the Javadoc is a copy from the GeoAPI interface.
The contribution in the equals method disappears since that method has been
+removed from Geotk (replaced by a mechanism based on Java reflection).
Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24867:24990 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/citation/OnLineResourceImpl.java| Revision 24867 | Revision 24990 |
|---|---|
*/ +private URI linkage; + +/** + * Creates an initially empty on line resource. + */ |
+ */
+private URI linkage;
+
+private String name;
+
+/**
+ * Creates an initially empty on line resource.
+ */ |
}
+
+/**
+ * Returns the detailed text description of what the online resource is/does.
+ * Returns {@code null} if none.
+ */ |
+} + +/** + * Name of the online resource. Returns {@code null} if none. + * + * @since 2.4 + */ +public String getName() { + return name; +} + +/** + * Set the name of the online resource. Returns {@code null} if none. + * + * @since 2.4 + */ +public synchronized void setName(final String newValue) { + checkWritePermission(); + name = newValue; +} + +/** + * Returns the detailed text description of what the online resource is/does. + * Returns {@code null} if none. + */ |
if (object!=null && object.getClass().equals(getClass())) {
+ final OnLineResourceImpl that = (OnLineResourceImpl) object;
+ return Utilities.equals(this.applicationProfile, that.applicationProfile) &&
+ Utilities.equals(this.description, that.description ) &&
+ Utilities.equals(this.function, that.function ) &&
+ Utilities.equals(this.linkage, that.linkage ); |
+if (object!=null && object.getClass().equals(getClass())) {
+ final OnLineResourceImpl that = (OnLineResourceImpl) object;
+ return Utilities.equals(this.applicationProfile, that.applicationProfile) &&
+ Utilities.equals(this.name, that.name ) &&
+ Utilities.equals(this.description, that.description ) &&
+ Utilities.equals(this.function, that.function ) &&
+ Utilities.equals(this.linkage, that.linkage ); |
| Author: | chorner |
| Date: | 2007-04-03 |
| Message: | Metadata; corrections after review of r24868 |
| Author: | jgarnett |
| Date: | 2007-11-29 |
| Message: | commit enough equals magic, and fixes to style object that shapefile renderer can draw something |
The change in the equals method has been reverted, since it performed the job
+of a deepEquals method (now part of JDK7). The second equals method
+has been removed since it duplicates the java.util.Arrays work.
Command line:
+svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r28155:28159 http://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/util/Utilities.java| Revision 28155 | Revision 28159 |
|---|---|
*/ +package org.geotools.resources; + +import java.util.Arrays; +import java.util.logging.Level; +import java.util.logging.LogRecord; |
+ */
+package org.geotools.resources;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.logging.LogRecord; |
* Convenience method for testing two objects for equality. One or both objects may be null.
+ */
+public static boolean equals(final Object object1, final Object object2) {
+ return (object1==object2) || (object1!=null && object1.equals(object2));
+}
+
+/**
+ * Returns {@code true} if the two specified objects implements exactly the same set of
+ * interfaces. Only interfaces assignable to {@code base} are compared. Declaration order |
+ * Convenience method for testing two objects for equality. One or both objects may be null.
+ */
+public static boolean equals(final Object object1, final Object object2) {
+ if( object1 == object2 ) return true;
+ if( object1 == null || object2 == null ) return false;
+ if( object1.getClass().isArray() && object2.getClass().isArray() ){
+ int length1 = Array.getLength( object1 );
+ int length2 = Array.getLength( object2 );
+ if( length1 != length2 ) {
+ return false;
+}
+ for( int i = 0; i < length1; i++ ){
+ Object item1 = Array.get( object1, i );
+ Object item2 = Array.get( object2, i );
+ if( !equals( item1, item2 ) ){
+ return false;
+ }
+ }
+ return true;
+ }
+ else return object1.equals( object2 );
+}
+
+public static boolean equals(final float array1[], final float array2[] ){
+ if( array1==array2 ) return true;
+ if( array1 == null || array2 == null ) return false;
+ if( array1.length != array2.length) return false;
+ for( int i=0; i<array1.length; i++){
+ if( array1[i] != array2[i]) return false;
+ }
+ return true;
+}
+/**
+ * Returns {@code true} if the two specified objects implements exactly the same set of
+ * interfaces. Only interfaces assignable to {@code base} are compared. Declaration order |