graphl-cvs Mailing List for Graphl - Hybrid graph visualization tool (Page 3)

Status: Pre-Alpha

Brought to you by: flo1

graphl-cvs — cvs commit mails

You can subscribe to this list here.

2004	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (48)	_Sep (6)	_Oct (64)	_Nov (12)	_Dec (13)
2005	_Jan (10)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (34)	_Sep (31)	_Oct	_Nov	_Dec (25)
2006	_Jan	_Feb	_Mar	_Apr	_May	_Jun (43)	_Jul (16)	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 5 .. 13 > >> (Page 3 of 13)

[graphl-cvs] graphl/src/org/mediavirus/graphl/gui TypeMenu.java

From: Flo L. <fl...@us...> - 2006-06-08 13:15:30

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17343/src/org/mediavirus/graphl/gui

Modified Files:
	TypeMenu.java 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

Index: TypeMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/TypeMenu.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TypeMenu.java	18 Dec 2005 11:11:40 -0000	1.4
--- TypeMenu.java	8 Jun 2006 13:15:01 -0000	1.5
***************
*** 57,61 ****
  	 */
  	protected void addItem(Node node, int which, boolean deep) {
! 		List items = node.getNeighbours(NS.graphl + "contains", true);
  		
  		for (Iterator iter = items.iterator(); iter.hasNext();) {
--- 57,61 ----
  	 */
  	protected void addItem(Node node, int which, boolean deep) {
! 		List items = node.getNeighbours(NS.graphl + "contains", Node.FORWARD);
  		
  		for (Iterator iter = items.iterator(); iter.hasNext();) {
***************
*** 71,75 ****
  			   || (((which & PROPERTIES) > 0) && item.hasType("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"))) {
  				if (item.hasType("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property")) {
! 					Node range = item.getFirstNeighbour("http://www.w3.org/2000/01/rdf-schema#range",true);
  					if (range != null && range.getId().equals("http://www.w3.org/2000/01/rdf-schema#Literal")) {
  						// skip properties that have a range of literal
--- 71,75 ----
  			   || (((which & PROPERTIES) > 0) && item.hasType("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"))) {
  				if (item.hasType("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property")) {
! 					Node range = item.getFirstNeighbour("http://www.w3.org/2000/01/rdf-schema#range",Node.FORWARD);
  					if (range != null && range.getId().equals("http://www.w3.org/2000/01/rdf-schema#Literal")) {
  						// skip properties that have a range of literal

[graphl-cvs] graphl/web/config/vocabs foaf-owl.rdf dc-terms-1.1.rdf dc-elements-1.1.rdf rdf+rdfs.rdf

From: Flo L. <fl...@us...> - 2006-06-08 13:15:22

Update of /cvsroot/graphl/graphl/web/config/vocabs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17343/web/config/vocabs

Added Files:
	foaf-owl.rdf dc-terms-1.1.rdf dc-elements-1.1.rdf rdf+rdfs.rdf 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

--- NEW FILE: dc-elements-1.1.rdf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE rdf:RDF [
    <!ENTITY rdfns 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
    <!ENTITY rdfsns 'http://www.w3.org/2000/01/rdf-schema#'>
    <!ENTITY dcns 'http://purl.org/dc/elements/1.1/'>
    <!ENTITY dctermsns 'http://purl.org/dc/terms/'>
    <!ENTITY dctypens 'http://purl.org/dc/dcmitype/'>
]>
<rdf:RDF xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about="http://purl.org/dc/elements/1.1/">
<dc:title xml:lang="en-US">The Dublin Core Element Set v1.1 namespace providing access to its content by means of an RDF Schema</dc:title>
<dc:publisher xml:lang="en-US">The Dublin Core Metadata Initiative</dc:publisher>
<dc:description xml:lang="en-US">The Dublin Core Element Set v1.1 namespace provides URIs for the Dublin Core Elements v1.1. Entries are declared using RDF Schema language to support RDF applications.</dc:description>
<dc:language xml:lang="en-US">English</dc:language>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2003-03-24</dcterms:modified>
<dc:source rdf:resource="http://dublincore.org/documents/dces/"/>
<dc:source rdf:resource="http://dublincore.org/usage/decisions/"/>
<dcterms:isReferencedBy rdf:resource="http://www.dublincore.org/documents/2001/10/26/dcmi-namespace/"/>
<dcterms:isRequiredBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:isReferencedBy rdf:resource="http://purl.org/dc/dcmitype/"/>
</rdf:Description>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/title">
<rdfs:label xml:lang="en-US">Title</rdfs:label>
<rdfs:comment xml:lang="en-US">A name given to the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Typically, a Title will be a name by which the resource is
		formally known.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#title-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/creator">
<rdfs:label xml:lang="en-US">Creator</rdfs:label>
<rdfs:comment xml:lang="en-US">An entity primarily responsible for making the content 
		of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Examples of a Creator include a person, an organisation,
		or a service.  Typically, the name of a Creator should 
		be used to indicate the entity.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#creator-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/subject">
<rdfs:label xml:lang="en-US">Subject and Keywords</rdfs:label>
<rdfs:comment xml:lang="en-US">The topic of the content of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Typically, a Subject will be expressed as keywords,
		key phrases or classification codes that describe a topic
		of the resource.  Recommended best practice is to select 
		a value from a controlled vocabulary or formal 
		classification scheme.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#subject-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/description">
<rdfs:label xml:lang="en-US">Description</rdfs:label>
<rdfs:comment xml:lang="en-US">An account of the content of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Description may include but is not limited to: an abstract,
		table of contents, reference to a graphical representation
		of content or a free-text account of the content.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#description-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/publisher">
<rdfs:label xml:lang="en-US">Publisher</rdfs:label>
<rdfs:comment xml:lang="en-US">An entity responsible for making the resource available</rdfs:comment>
<dc:description xml:lang="en-US">Examples of a Publisher include a person, an organisation,
		or a service.
		Typically, the name of a Publisher should be used to
		indicate the entity.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#publisher-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/contributor">
<rdfs:label xml:lang="en-US">Contributor</rdfs:label>
<rdfs:comment xml:lang="en-US">An entity responsible for making contributions to the
		content of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Examples of a Contributor include a person, an 
		organisation, or a service.  Typically, the name of a 
		Contributor should be used to indicate the entity.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#contributor-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/date">
<rdfs:label xml:lang="en-US">Date</rdfs:label>
<rdfs:comment xml:lang="en-US">A date associated with an event in the life cycle of the
		resource.</rdfs:comment>
<dc:description xml:lang="en-US">Typically, Date will be associated with the creation or
		availability of the resource.  Recommended best practice
		for encoding the date value is defined in a profile of
		ISO 8601 [W3CDTF] and follows the YYYY-MM-DD format.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#date-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/type">
<rdfs:label xml:lang="en-US">Resource Type</rdfs:label>
<rdfs:comment xml:lang="en-US">The nature or genre of the content of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Type includes terms describing general categories, functions,
		genres, or aggregation levels for content. Recommended best
		practice is to select a value from a controlled vocabulary
		(for example, the DCMI Type Vocabulary [DCMITYPE]). To 
		describe the physical or digital manifestation of the 
		resource, use the Format element.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#type-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/format">
<rdfs:label xml:lang="en-US">Format</rdfs:label>
<rdfs:comment xml:lang="en-US">The physical or digital manifestation of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Typically, Format may include the media-type or dimensions of
		the resource. Format may be used to determine the software,
		hardware or other equipment needed to display or operate the
		resource. Examples of dimensions include size and duration.
		Recommended best practice is to select a value from a
		controlled vocabulary (for example, the list of Internet Media
		Types [MIME] defining computer media formats).</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#format-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/identifier">
<rdfs:label xml:lang="en-US">Resource Identifier</rdfs:label>
<rdfs:comment xml:lang="en-US">An unambiguous reference to the resource within a given context.</rdfs:comment>
<dc:description xml:lang="en-US">Recommended best practice is to identify the resource by means
		of a string or number conforming to a formal identification
		system.
		Example formal identification systems include the Uniform
		Resource Identifier (URI) (including the Uniform Resource
		Locator (URL)), the Digital Object Identifier (DOI) and the
		International Standard Book Number (ISBN).</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#identifier-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/source">
<rdfs:label xml:lang="en-US">Source</rdfs:label>
<rdfs:comment xml:lang="en-US">A reference to a resource from which the present resource
		is derived.</rdfs:comment>
<dc:description xml:lang="en-US">The present resource may be derived from the Source resource
		in whole or in part.  Recommended best practice is to reference
		the resource by means of a string or number conforming to a
		formal identification system.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#source-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/language">
<rdfs:label xml:lang="en-US">Language</rdfs:label>
<rdfs:comment xml:lang="en-US">A language of the intellectual content of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Recommended best practice is to use RFC 3066 [RFC3066],
		which, in conjunction with ISO 639 [ISO639], defines two-
		and three-letter primary language tags with optional
		subtags.  Examples include "en" or "eng" for English,
		"akk" for Akkadian, and "en-GB" for English used in the
		United Kingdom.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#language-005"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/relation">
<rdfs:label xml:lang="en-US">Relation</rdfs:label>
<rdfs:comment xml:lang="en-US">A reference to a related resource.</rdfs:comment>
<dc:description xml:lang="en-US">Recommended best practice is to reference the resource by means
		of a string or number conforming to a formal identification
		system.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#relation-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/coverage">
<rdfs:label xml:lang="en-US">Coverage</rdfs:label>
<rdfs:comment xml:lang="en-US">The extent or scope of the content of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Coverage will typically include spatial location (a place name
		or geographic coordinates), temporal period (a period label,
		date, or date range) or jurisdiction (such as a named
		administrative entity).
		Recommended best practice is to select a value from a
		controlled vocabulary (for example, the Thesaurus of Geographic
		Names [TGN]) and that, where appropriate, named places or time
		periods be used in preference to numeric identifiers such as
		sets of coordinates or date ranges.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#coverage-004"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/elements/1.1/rights">
<rdfs:label xml:lang="en-US">Rights Management</rdfs:label>
<rdfs:comment xml:lang="en-US">Information about rights held in and over the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Typically, a Rights element will contain a rights
		management statement for the resource, or reference
		a service providing such information. Rights information
		often encompasses Intellectual Property Rights (IPR),
		Copyright, and various Property Rights.
		If the Rights element is absent, no assumptions can be made
		about the status of these and other rights with respect to
		the resource.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:issued>1999-07-02</dcterms:issued>
<dcterms:modified>2002-10-04</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#rights-004"/>
</rdf:Property>
</rdf:RDF>

--- NEW FILE: dc-terms-1.1.rdf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE rdf:RDF [
    <!ENTITY rdfns 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
    <!ENTITY rdfsns 'http://www.w3.org/2000/01/rdf-schema#'>
    <!ENTITY dcns 'http://purl.org/dc/elements/1.1/'>
    <!ENTITY dctermsns 'http://purl.org/dc/terms/'>
    <!ENTITY dctypens 'http://purl.org/dc/dcmitype/'>
]>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
<rdf:Description rdf:about="http://purl.org/dc/terms/">
<dc:title xml:lang="en-US">The Dublin Core Terms Namespace providing access to its content by means of an RDF Schema.</dc:title>
<dc:publisher xml:lang="en-US">The Dublin Core Metadata Initiative</dc:publisher>
<dc:description xml:lang="en-US">The Dublin Core Terms namespace provides URIs for the Dublin Core Element Set Qualifier Vocabulary. Vocabulary terms are declared using RDF Schema language to support RDF applications. The Dublin Core qualifiers form a richer vocabulary, which is intended to facilitate discovery of resources. It will be updated according to dc-usage decisions.</dc:description>
<dc:language xml:lang="en-US">English</dc:language>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-05-24</dcterms:modified>
<dc:source rdf:resource="http://www.dublincore.org/documents/2000/07/11/dcmes-qualifiers/"/>
<dc:source rdf:resource="http://www.dublincore.org/usage/decisions/"/>
<dcterms:requires rdf:resource="http://purl.org/dc/elements/1.1/"/>
<dcterms:references rdf:resource="http://purl.org/dc/dcmitype/"/>
</rdf:Description>
<rdf:Property rdf:about="http://purl.org/dc/terms/audience">
<rdfs:label xml:lang="en-US">Audience</rdfs:label>
<rdfs:comment xml:lang="en-US">A class of entity for whom the resource is intended or useful.</rdfs:comment>
<dc:description xml:lang="en-US">A class of entity may be determined by the creator or the 
		publisher or by a third party.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2001-05-21</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#audience-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/alternative">
<rdfs:label xml:lang="en-US">Alternative</rdfs:label>
<rdfs:comment xml:lang="en-US">Any form of the title used as a substitute or alternative 
		to the formal title of the resource.</rdfs:comment>
<dc:description xml:lang="en-US">This qualifier can include Title abbreviations as well 
		as translations.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/title"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#alternative-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/tableOfContents">
<rdfs:label xml:lang="en-US">Table Of Contents</rdfs:label>
<rdfs:comment xml:lang="en-US">A list of subunits of the content of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/description"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#tableOfContents-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/abstract">
<rdfs:label xml:lang="en-US">Abstract</rdfs:label>
<rdfs:comment xml:lang="en-US">A summary of the content of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/description"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#abstract-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/created">
<rdfs:label xml:lang="en-US">Created</rdfs:label>
<rdfs:comment xml:lang="en-US">Date of creation of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#created-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/valid">
<rdfs:label xml:lang="en-US">Valid</rdfs:label>
<rdfs:comment xml:lang="en-US">Date (often a range) of validity of a resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#valid-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/available">
<rdfs:label xml:lang="en-US">Available</rdfs:label>
<rdfs:comment xml:lang="en-US">Date (often a range) that the resource will become or did 
		become available.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#available-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/issued">
<rdfs:label xml:lang="en-US">Issued</rdfs:label>
<rdfs:comment xml:lang="en-US">Date of formal issuance (e.g., publication) of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#issued-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/modified">
<rdfs:label xml:lang="en-US">Modified</rdfs:label>
<rdfs:comment xml:lang="en-US">Date on which the resource was changed.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#modified-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/extent">
<rdfs:label xml:lang="en-US">Extent</rdfs:label>
<rdfs:comment xml:lang="en-US">The size or duration of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/format"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#extent-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/medium">
<rdfs:label xml:lang="en-US">Medium</rdfs:label>
<rdfs:comment xml:lang="en-US">The material or physical carrier of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/format"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#medium-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/isVersionOf">
<rdfs:label xml:lang="en-US">Is Version Of</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource is a version, edition, or adaptation 
		of the referenced resource. Changes in version imply substantive 
		changes in content rather than differences in format.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#isVersionOf-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/hasVersion">
<rdfs:label xml:lang="en-US">Has Version</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource has a version, edition, or adaptation, 
		namely, the referenced resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#hasVersion-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/isReplacedBy">
<rdfs:label xml:lang="en-US">Is Replaced By</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource is supplanted, displaced, or 
		superseded by the referenced resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#isReplacedBy-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/replaces">
<rdfs:label xml:lang="en-US">Replaces</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource supplants, displaces, or supersedes 
		the referenced resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#replaces-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/isRequiredBy">
<rdfs:label xml:lang="en-US">Is Required By</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource is required by the referenced resource, 
		either physically or logically.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#isRequiredBy-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/requires">
<rdfs:label xml:lang="en-US">Requires</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource requires the referenced resource to 
		support its function, delivery, or coherence of content.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#requires-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/isPartOf">
<rdfs:label xml:lang="en-US">Is Part Of</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource is a physical or logical part of the 
		referenced resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#isPartOf-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/hasPart">
<rdfs:label xml:lang="en-US">Has Part</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource includes the referenced resource either 
		physically or logically.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#hasPart-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/isReferencedBy">
<rdfs:label xml:lang="en-US">Is Referenced By</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource is referenced, cited, or otherwise 
		pointed to by the referenced resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#isReferencedBy-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/references">
<rdfs:label xml:lang="en-US">References</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource references, cites, or otherwise points 
		to the referenced resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#references-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/isFormatOf">
<rdfs:label xml:lang="en-US">Is Format Of</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource is the same intellectual content of 
		the referenced resource, but presented in another format.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#isFormatOf-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/hasFormat">
<rdfs:label xml:lang="en-US">Has Format</rdfs:label>
<rdfs:comment xml:lang="en-US">The described resource pre-existed the referenced resource, 
		which is essentially the same intellectual content presented 
		in another format.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#hasFormat-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/conformsTo">
<rdfs:label xml:lang="en-US">Conforms To</rdfs:label>
<rdfs:comment xml:lang="en-US">A reference to an established standard to which the resource conforms.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2001-05-21</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#conformsTo-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/spatial">
<rdfs:label xml:lang="en-US">Spatial</rdfs:label>
<rdfs:comment xml:lang="en-US">Spatial characteristics of the intellectual content of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/coverage"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#spatial-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/temporal">
<rdfs:label xml:lang="en-US">Temporal</rdfs:label>
<rdfs:comment xml:lang="en-US">Temporal characteristics of the intellectual content of the resource.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/coverage"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#temporal-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/mediator">
<rdfs:label xml:lang="en-US">Mediator</rdfs:label>
<rdfs:comment xml:lang="en-US">A class of entity that mediates access to the
		resource and for whom the resource is intended or useful.</rdfs:comment>
<dc:description xml:lang="en-US">The audiences for a resource are of two basic classes: (1) an 
		ultimate beneficiary of the resource, and (2) frequently, an 
		entity that mediates access to the resource.  The mediator 
		element refinement represents the second of these two classes.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2001-05-21</dcterms:issued>
<dcterms:modified>2002-07-13</dcterms:modified>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/terms/audience"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#mediator-002"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/dateAccepted">
<rdfs:label xml:lang="en-US">Date Accepted</rdfs:label>
<rdfs:comment xml:lang="en-US">Date of acceptance of the resource (e.g. of thesis
		by university department, of article by journal, etc.).</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2002-07-13</dcterms:issued>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#dateAccepted-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/dateCopyrighted">
<rdfs:label xml:lang="en-US">Date Copyrighted</rdfs:label>
<rdfs:comment xml:lang="en-US">Date of a statement of copyright.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2002-07-13</dcterms:issued>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#dateCopyrighted-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/dateSubmitted">
<rdfs:label xml:lang="en-US">Date Submitted</rdfs:label>
<rdfs:comment xml:lang="en-US">Date of submission of the resource (e.g. thesis, 
		articles, etc.).</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2002-07-13</dcterms:issued>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/date"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#dateSubmitted-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/educationLevel">
<rdfs:label xml:lang="en-US">Audience Education Level</rdfs:label>
<rdfs:comment xml:lang="en-US">A general statement describing the education or 
		training context.  Alternatively, a more specific 
		statement of the location of the audience in terms of 
		its progression through an education or training context.</rdfs:comment>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2002-07-13</dcterms:issued>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/terms/audience"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#educationLevel-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/accessRights">
<rdfs:label xml:lang="en-US">Access Rights</rdfs:label>
<rdfs:comment xml:lang="en-US">Information about who can access the
        resource or an indication of its security status.
        </rdfs:comment>
<dc:description xml:lang="en-US">Access Rights may include information
        regarding access or restrictions based on privacy, 
        security or other regulations.
        </dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2003-02-15</dcterms:issued>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/rights"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#accessRights-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/bibliographicCitation">
<rdfs:label xml:lang="en-US">Bibliographic Citation</rdfs:label>
<rdfs:comment xml:lang="en-US">A bibliographic reference for the resource.
        </rdfs:comment>
<dc:description xml:lang="en-US">Recommended practice is to include sufficient 
        bibliographic detail to identify the resource as 
        unambiguously as possible, whether or not the
        citation is in a standard form.
        </dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2003-02-15</dcterms:issued>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/identifier"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#bibliographicCitation-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/license">
<rdfs:label xml:lang="en-US">License</rdfs:label>
<rdfs:comment xml:lang="en-US">A legal document giving official permission to do something
        with the resource.</rdfs:comment>
<dc:description xml:lang="en-US">Recommended best practice is to identify the license using a
        URI. Examples of such licenses can be found at
        http://creativecommons.org/licenses/.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2004-06-14</dcterms:issued>
<rdfs:subPropertyOf rdf:resource="http://purl.org/dc/elements/1.1/rights"/>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element-refinement"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#license-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/rightsHolder">
<rdfs:label xml:lang="en-US">Rights Holder</rdfs:label>
<rdfs:comment xml:lang="en-US">A person or organization owning or managing rights over the resource.
        </rdfs:comment>
<dc:description xml:lang="en-US">Recommended best practice is to use the URI or name of
        the Rights Holder to indicate the entity.</dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2004-06-14</dcterms:issued>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#rightsHolder-001"/>
</rdf:Property>
<rdf:Property rdf:about="http://purl.org/dc/terms/provenance">
<rdfs:label xml:lang="en-US">Provenance</rdfs:label>
<rdfs:comment xml:lang="en-US">A statement of any changes in ownership and custody
        of the resource since its creation that are
        significant for its authenticity, integrity and
        interpretation.
        </rdfs:comment>
<dc:description xml:lang="en-US">The statement may include a description of any
        changes successive custodians made to the resource.
        </dc:description>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2004-09-20</dcterms:issued>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#provenance-001"/>
</rdf:Property>
<rdfs:Class rdf:about="http://purl.org/dc/terms/SubjectScheme">
    <rdfs:label xml:lang="en-US">Subject Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of subject encoding schemes and/or formats</rdfs:comment>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/subject"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/DateScheme">
    <rdfs:label xml:lang="en-US">Date Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of date encoding schemes and/or formats </rdfs:comment>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/date"/>
    <dcterms:references rdf:resource="http://purl.org/dc/terms/temporal"/>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/FormatScheme">
    <rdfs:label xml:lang="en-US">Format Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of format encoding schemes.</rdfs:comment>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/format"/>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/LanguageScheme">
    <rdfs:label xml:lang="en-US">Language Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of language encoding schemes and/or formats.</rdfs:comment>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/language"/>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/SpatialScheme">
    <rdfs:label xml:lang="en-US">Place Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of geographic place encoding schemes and/or formats</rdfs:comment>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:references rdf:resource="http://purl.org/dc/terms/spatial"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/TemporalScheme">
    <rdfs:label xml:lang="en-US">Encoding Schemes
      for temporal characteristics</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of encoding schemes for 
     the coverage qualifier "temporal"</rdfs:comment>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
    <dcterms:references rdf:resource="http://purl.org/dc/terms/temporal"/>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/TypeScheme">
    <rdfs:label xml:lang="en-US">Resource Type Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of resource type encoding schemes and/or formats</rdfs:comment>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/type"/>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/IdentifierScheme">
    <rdfs:label xml:lang="en-US">Resource Identifier Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of resource identifier encoding schemes and/or formats</rdfs:comment>
   <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/identifier"/>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/RelationScheme">
    <rdfs:label xml:lang="en-US">Resource Relation Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of resource relation encoding schemes and/or formats</rdfs:comment>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/relation"/>
  </rdfs:Class>
<rdfs:Class rdf:about="http://purl.org/dc/terms/SourceScheme">
    <rdfs:label xml:lang="en-US">Source Encoding Schemes</rdfs:label>
    <rdfs:comment xml:lang="en-US">A set of source encoding schemes and/or formats</rdfs:comment>
    <rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
    <dcterms:issued>2000-07-11</dcterms:issued>
    <dcterms:references rdf:resource="http://purl.org/dc/elements/1.1/source"/>
  </rdfs:Class>
<dcterms:SubjectScheme rdf:about="http://purl.org/dc/terms/LCSH">
<rdfs:label xml:lang="en-US">LCSH</rdfs:label>
<rdfs:comment xml:lang="en-US">Library of Congress Subject Headings</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#LCSH-002"/>
</dcterms:SubjectScheme>
<dcterms:SubjectScheme rdf:about="http://purl.org/dc/terms/MESH">
<rdfs:label xml:lang="en-US">MeSH</rdfs:label>
<rdfs:comment xml:lang="en-US">Medical Subject Headings</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.nlm.nih.gov/mesh/meshhome.html"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#MESH-002"/>
</dcterms:SubjectScheme>
<dcterms:SubjectScheme rdf:about="http://purl.org/dc/terms/DDC">
<rdfs:label xml:lang="en-US">DDC</rdfs:label>
<rdfs:comment xml:lang="en-US">Dewey Decimal Classification</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.oclc.org/dewey/index.htm"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#DDC-002"/>
</dcterms:SubjectScheme>
<dcterms:SubjectScheme rdf:about="http://purl.org/dc/terms/LCC">
<rdfs:label xml:lang="en-US">LCC</rdfs:label>
<rdfs:comment xml:lang="en-US">Library of Congress Classification</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://lcweb.loc.gov/catdir/cpso/lcco/lcco.html"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#LCC-002"/>
</dcterms:SubjectScheme>
<dcterms:SubjectScheme rdf:about="http://purl.org/dc/terms/UDC">
<rdfs:label xml:lang="en-US">UDC</rdfs:label>
<rdfs:comment xml:lang="en-US">Universal Decimal Classification</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.udcc.org/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#UDC-002"/>
</dcterms:SubjectScheme>
<dcterms:TypeScheme rdf:about="http://purl.org/dc/terms/DCMIType">
<rdfs:label xml:lang="en-US">DCMI Type Vocabulary</rdfs:label>
<rdfs:comment xml:lang="en-US">A list of types used to categorize the nature or genre 
										of the content of the resource.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://dublincore.org/documents/dcmi-type-vocabulary/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#DCMIType-002"/>
</dcterms:TypeScheme>
<dcterms:FormatScheme rdf:about="http://purl.org/dc/terms/IMT">
<rdfs:label xml:lang="en-US">IMT</rdfs:label>
<rdfs:comment xml:lang="en-US">The Internet media type of the resource.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.iana.org/assignments/media-types/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2004-12-17</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#IMT-003"/>
</dcterms:FormatScheme>
<dcterms:FormatScheme rdf:about="http://purl.org/dc/terms/IMT">
<rdfs:label xml:lang="en-US">IMT</rdfs:label>
<rdfs:comment xml:lang="en-US">The Internet media type of the resource.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.isi.edu/in-notes/iana/assignments/media-types/media-types"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#IMT-002"/>
</dcterms:FormatScheme>
<dcterms:LanguageScheme rdf:about="http://purl.org/dc/terms/ISO639-2">
<rdfs:label xml:lang="en-US">ISO 639-2</rdfs:label>
<rdfs:comment xml:lang="en-US">ISO 639-2: Codes for the representation of names of languages.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://lcweb.loc.gov/standards/iso639-2/langhome.html"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#ISO639-2-002"/>
</dcterms:LanguageScheme>
<dcterms:LanguageScheme rdf:about="http://purl.org/dc/terms/RFC1766">
<rdfs:label xml:lang="en-US">RFC 1766</rdfs:label>
<rdfs:comment xml:lang="en-US">Internet RFC 1766 'Tags for the identification of Language' 
										specifies a two letter code taken from ISO 639, followed 
										optionally by a two letter country code taken from ISO 3166.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.ietf.org/rfc/rfc1766.txt"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#RFC1766-002"/>
</dcterms:LanguageScheme>
<dcterms:IdentifierScheme rdf:about="http://purl.org/dc/terms/URI">
<rdfs:label xml:lang="en-US">URI</rdfs:label>
<rdfs:comment xml:lang="en-US">A URI Uniform Resource Identifier</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdf:type rdf:resource="http://purl.org/dc/terms/SourceScheme"/>
<rdf:type rdf:resource="http://purl.org/dc/terms/RelationScheme"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.ietf.org/rfc/rfc2396.txt"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#URI-002"/>
</dcterms:IdentifierScheme>
<dcterms:SpatialScheme rdf:about="http://purl.org/dc/terms/Point">
<rdfs:label xml:lang="en-US">DCMI Point</rdfs:label>
<rdfs:comment xml:lang="en-US">The DCMI Point identifies a point in space using its geographic coordinates.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://dublincore.org/documents/dcmi-point/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#Point-002"/>
</dcterms:SpatialScheme>
<dcterms:SpatialScheme rdf:about="http://purl.org/dc/terms/ISO3166">
<rdfs:label xml:lang="en-US">ISO 3166</rdfs:label>
<rdfs:comment xml:lang="en-US">ISO 3166 Codes for the representation of names of countries</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2004-12-17</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#ISO3166-003"/>
</dcterms:SpatialScheme>
<dcterms:SpatialScheme rdf:about="http://purl.org/dc/terms/ISO3166">
<rdfs:label xml:lang="en-US">ISO 3166</rdfs:label>
<rdfs:comment xml:lang="en-US">ISO 3166 Codes for the representation of names of countries</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/index.html"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#ISO3166-002"/>
</dcterms:SpatialScheme>
<dcterms:SpatialScheme rdf:about="http://purl.org/dc/terms/Box">
<rdfs:label xml:lang="en-US">DCMI Box</rdfs:label>
<rdfs:comment xml:lang="en-US">The DCMI Box identifies a region of space using its geographic limits.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://dublincore.org/documents/dcmi-box/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#Box-002"/>
</dcterms:SpatialScheme>
<dcterms:SpatialScheme rdf:about="http://purl.org/dc/terms/TGN">
<rdfs:label xml:lang="en-US">TGN</rdfs:label>
<rdfs:comment xml:lang="en-US">The Getty Thesaurus of Geographic Names</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.getty.edu/research/tools/vocabulary/tgn/index.html"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#TGN-002"/>
</dcterms:SpatialScheme>
<dcterms:DateScheme rdf:about="http://purl.org/dc/terms/Period">
<rdfs:label xml:lang="en-US">DCMI Period</rdfs:label>
<rdfs:comment xml:lang="en-US">A specification of the limits of a time interval.</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdf:type rdf:resource="http://purl.org/dc/terms/TemporalScheme"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://dublincore.org/documents/dcmi-period/"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#Period-002"/>
</dcterms:DateScheme>
<dcterms:DateScheme rdf:about="http://purl.org/dc/terms/W3CDTF">
<rdfs:label xml:lang="en-US">W3C-DTF</rdfs:label>
<rdfs:comment xml:lang="en-US">W3C Encoding rules for dates and times - a profile based on ISO 8601</rdfs:comment>
<rdf:type rdf:resource="http://www.w3.org/2000/01/rdf-schema#Class"/>
<rdf:type rdf:resource="http://purl.org/dc/terms/TemporalScheme"/>
<rdfs:isDefinedBy rdf:resource="http://purl.org/dc/terms/"/>
<rdfs:seeAlso rdf:resource="http://www.w3.org/TR/NOTE-datetime"/>
<dcterms:issued>2000-07-11</dcterms:issued>
<dcterms:modified>2002-06-15</dcterms:modified>
<dc:type rdf:resource="http://dublincore.org/usage/documents/principles/#encoding-scheme"/>
<dcterms:hasVersion rdf:resource="http://dublincore.org/usage/terms/history/#W3CDTF-002"/>
</dcterms:DateScheme>
<dcterms:LanguageScheme rdf:about="http://purl.org/dc/terms/RFC3066">
<rdfs:label xml:lang="en-US">RFC 3066</rdfs:label>
<rdfs:comment xml:lang="en-US">Internet RFC 3066 'Tags for the Identification of 
		Languages' specifies a primary subtag which
		is a two-letter code taken from ISO 639 part
		1 or a three-letter code taken from ISO 639
		...
 
[truncated message content]

[graphl-cvs] graphl/web applet.html

From: Flo L. <fl...@us...> - 2006-06-08 13:15:20

Update of /cvsroot/graphl/graphl/web
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17343/web

Modified Files:
	applet.html 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

Index: applet.html
===================================================================
RCS file: /cvsroot/graphl/graphl/web/applet.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** applet.html	21 Jun 2004 18:48:07 -0000	1.1
--- applet.html	8 Jun 2006 13:15:00 -0000	1.2
***************
*** 8,12 ****
    code="org.mediavirus.graphl.GraphlApplet"
    codebase="applet"
!   archive="graphl.jar, rdfapi.jar"
    name="GraphlApplet"
    width="100%"
--- 8,12 ----
    code="org.mediavirus.graphl.GraphlApplet"
    codebase="applet"
!   archive="graphl.jar, rdfapi.jar, commons-jxpath-1.2.jar, l2fprod.jar"
    name="GraphlApplet"
    width="100%"

[graphl-cvs] graphl/src/org/mediavirus/graphl/graph DefaultGraph.java Node.java DefaultNode.java Graph.java DefaultEdge.java

From: Flo L. <fl...@us...> - 2006-06-08 13:15:14

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17343/src/org/mediavirus/graphl/graph

Modified Files:
	DefaultGraph.java Node.java DefaultNode.java Graph.java 
	DefaultEdge.java 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

Index: Graph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Graph.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Graph.java	18 Dec 2005 11:11:40 -0000	1.7
--- Graph.java	8 Jun 2006 13:15:00 -0000	1.8
***************
*** 43,53 ****
       */
      List<Edge> getEdges();
  	
  	public Node createNode();
! 	public Node getNodeOrNew(String id);
  	
  	public Edge createEdge(Node from, Node to);
  	
  	public void addElements(Collection<Node> nodes, Collection<Edge> edges);
  
  }
--- 43,55 ----
       */
      List<Edge> getEdges();
+     List<Edge> getEdgesWithPropertyValue(String name, String value);
  	
  	public Node createNode();
! 	public Node getNodeOrAdd(String id);
  	
  	public Edge createEdge(Node from, Node to);
  	
  	public void addElements(Collection<Node> nodes, Collection<Edge> edges);
+     public void deleteElements(Collection<Node> nodes, Collection<Edge> edges);
  
  }

Index: DefaultGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultGraph.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultGraph.java	18 Dec 2005 11:11:40 -0000	1.5
--- DefaultGraph.java	8 Jun 2006 13:15:00 -0000	1.6
***************
*** 1,8 ****
  package org.mediavirus.graphl.graph;
  
! import  java.util.Collection;
! import  java.util.Iterator;
! import  java.util.List;
! import  java.util.LinkedList;
  
  /**
--- 1,9 ----
  package org.mediavirus.graphl.graph;
  
! import java.util.ArrayList;
! import java.util.Collection;
! import java.util.Iterator;
! import java.util.LinkedList;
! import java.util.List;
  
  /**
***************
*** 77,98 ****
       */
      public synchronized void deleteElements(Collection<Node> nodes, Collection<Edge> edges) {
          if (nodes!=null) {
!             Iterator iterator=nodes.iterator();
!             while (iterator.hasNext()) {
!                 DefaultNode node=(DefaultNode)iterator.next();
                  allNodes.remove(node);
              }
          }
          if (edges!=null) {
!             Iterator iterator=edges.iterator();
              while (iterator.hasNext()) {
!                 DefaultEdge edge=(DefaultEdge)iterator.next();
                  if (allEdges.remove(edge)) {
!                     ((DefaultNode)edge.getFrom()).notifyEdgeRemoved(edge);
!                     ((DefaultNode)edge.getTo()).notifyEdgeRemoved(edge);
                  }
              }
          }
!         fireElementsRemoved(nodes,edges);
      }
      /**
--- 78,115 ----
       */
      public synchronized void deleteElements(Collection<Node> nodes, Collection<Edge> edges) {
+         List<Edge> nodeEdges = new ArrayList<Edge>();
          if (nodes!=null) {
!             Iterator<Node> nodesI=nodes.iterator();
!             while (nodesI.hasNext()) {
!                 Node node = nodesI.next();
!                 for (Iterator<Edge> edgesI = node.getEdgesFrom().iterator(); edgesI.hasNext();) {
!                     Edge edge = edgesI.next();
!                     if (allEdges.remove(edge)) {
!                         edge.getTo().notifyEdgeRemoved(edge);
!                         nodeEdges.add(edge);
!                     }
!                 }
!                 for (Iterator<Edge> edgesI = node.getEdgesTo().iterator(); edgesI.hasNext();) {
!                     Edge edge = edgesI.next();
!                     if (allEdges.remove(edge)) {
!                         edge.getFrom().notifyEdgeRemoved(edge);
!                         nodeEdges.add(edge);
!                     }
!                 }
                  allNodes.remove(node);
              }
          }
          if (edges!=null) {
!             Iterator<Edge> iterator = edges.iterator();
              while (iterator.hasNext()) {
!                 Edge edge = iterator.next();
                  if (allEdges.remove(edge)) {
!                     edge.getFrom().notifyEdgeRemoved(edge);
!                     edge.getTo().notifyEdgeRemoved(edge);
                  }
              }
          }
!         nodeEdges.addAll(edges);
!         fireElementsRemoved(nodes,nodeEdges);
      }
      /**
***************
*** 114,118 ****
  	 * Overrides @see org.mediavirus.graphl.graph.Graph#getNodeOrNew(java.lang.String)
  	 */
! 	public Node getNodeOrNew(String id){
  		return new DefaultNode();
  	}
--- 131,135 ----
  	 * Overrides @see org.mediavirus.graphl.graph.Graph#getNodeOrNew(java.lang.String)
  	 */
! 	public Node getNodeOrAdd(String id){
  		return new DefaultNode();
  	}
***************
*** 123,125 ****
--- 140,154 ----
  		return new DefaultEdge(from, to);
  	}
+     
+     public List<Edge> getEdgesWithPropertyValue(String name, String value) {
+         List<Edge> result = new ArrayList<Edge>();
+         for (Iterator<Edge> edgesI = allEdges.iterator(); edgesI.hasNext();) {
+             Edge edge = edgesI.next();
+             if (value.equals(edge.getProperty(name))) {
+                 result.add(edge);
+             }
+             
+         }
+         return result;
+     }
  }

Index: DefaultNode.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultNode.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DefaultNode.java	18 Dec 2005 11:11:40 -0000	1.17
--- DefaultNode.java	8 Jun 2006 13:15:00 -0000	1.18
***************
*** 199,233 ****
  	}
  
  	public List<Node> getNeighbours(String edgeType, boolean forwardOnly) {
! 		List<Node> nodes = new ArrayList<Node>(2);
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
! 		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
! 			if (edgeType.equals(edge.getType())) nodes.add(edge.getTo());
! 		}
! 		if (!forwardOnly) {
! 			allEdges = edgesTo.iterator();
! 			while (allEdges.hasNext()) {
! 				Edge edge = allEdges.next();
! 				if (edgeType.equals(edge.getType())) nodes.add(edge.getFrom());
! 			}			
! 		}
! 		return nodes;
  	}
  
  	public Node getFirstNeighbour(String edgeType, boolean forwardOnly) {
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
! 		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
! 			if (edgeType.equals(edge.getType())) return edge.getTo();
! 		}
! 		if (!forwardOnly) {
! 			allEdges = edgesTo.iterator();
! 			while (allEdges.hasNext()) {
! 				Edge edge = allEdges.next();
! 				if (edgeType.equals(edge.getType())) return edge.getFrom();
! 			}			
! 		}
! 		return null;
  	}
  
--- 199,252 ----
  	}
  
+     public List<Node> getNeighbours(String edgeType, int direction) {
+         
+         List<Node> nodes = new ArrayList<Node>(2);
+         Iterator<Edge> allEdges;
+         
+         if (direction == Node.FORWARD || direction == Node.BOTH ){
+             allEdges = edgesFrom.iterator();
+             while (allEdges.hasNext()) {
+                 Edge edge = allEdges.next();
+                 if (edgeType.equals(edge.getType())) nodes.add(edge.getTo());
+             }
+         }
+         if (direction == Node.REVERSE || direction == Node.BOTH ) {
+             allEdges = edgesTo.iterator();
+             while (allEdges.hasNext()) {
+                 Edge edge = allEdges.next();
+                 if (edgeType.equals(edge.getType())) nodes.add(edge.getFrom());
+             }           
+         }
+         return nodes;
+         
+     }
+     
+     public Node getFirstNeighbour(String edgeType, int direction) {
+         
+         Iterator<Edge> allEdges;
+ 
+         if (direction == Node.FORWARD || direction == Node.BOTH ){
+             allEdges = edgesFrom.iterator();
+             while (allEdges.hasNext()) {
+                 Edge edge = allEdges.next();
+                 if (edgeType.equals(edge.getType())) return edge.getTo();
+             }
+         }
+         if (direction == Node.REVERSE || direction == Node.BOTH ) {
+             allEdges = edgesTo.iterator();
+             while (allEdges.hasNext()) {
+                 Edge edge = allEdges.next();
+                 if (edgeType.equals(edge.getType())) return edge.getFrom();
+             }           
+         }
+         return null;
+     }
+     
  	public List<Node> getNeighbours(String edgeType, boolean forwardOnly) {
!         return getNeighbours(edgeType, forwardOnly ? Node.FORWARD : Node.BOTH);
  	}
  
  	public Node getFirstNeighbour(String edgeType, boolean forwardOnly) {
!         return getFirstNeighbour(edgeType,  forwardOnly ? Node.FORWARD : Node.BOTH);
  	}
  

Index: Node.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Node.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Node.java	18 Dec 2005 11:11:40 -0000	1.13
--- Node.java	8 Jun 2006 13:15:00 -0000	1.14
***************
*** 26,31 ****
--- 26,44 ----
      List<Edge> getEdgesTo(String type);
      
+     /**
+      * @deprecated
+      */
      List<Node> getNeighbours(String edgeType, boolean forwardOnly);
+     
+     public static final int BOTH = 0;
+     public static final int FORWARD = 1;
+     public static final int REVERSE = 2;
+     List<Node> getNeighbours(String edgeType, int direction);
+     
+     /**
+      * @deprecated
+      */
      Node getFirstNeighbour(String edgeType, boolean forwardOnly);
+     Node getFirstNeighbour(String edgeType, int direction);
  
      //TODO (3, 4h) there should be a NodeView interface that covers the visual aspects of a node. merge with NodeMovement class.
***************
*** 104,107 ****
--- 117,122 ----
  	
  	void invertPin(Edge edge);
+     
+     public void notifyEdgeRemoved(Edge edge);
  
  }

Index: DefaultEdge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultEdge.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DefaultEdge.java	18 Dec 2005 11:11:40 -0000	1.15
--- DefaultEdge.java	8 Jun 2006 13:15:00 -0000	1.16
***************
*** 170,174 ****
  	 */
  	public String getSource() {
! 		return source;
  	}
  
--- 170,174 ----
  	 */
  	public String getSource() {
! 		return getProperty(NS.graphl + "definedIn");
  	}
  
***************
*** 177,181 ****
  	 */
  	public void setSource(String source) {
! 		this.source = source;
  	}
  
--- 177,181 ----
  	 */
  	public void setSource(String source) {
! 		setProperty(NS.graphl + "definedIn", source);
  	}

[graphl-cvs] graphl/test geo.rdf map.jpg test-config.rdf test.rdf

From: Flo L. <fl...@us...> - 2006-06-08 13:15:06

Update of /cvsroot/graphl/graphl/test
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17343/test

Added Files:
	geo.rdf map.jpg test-config.rdf test.rdf 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

--- NEW FILE: geo.rdf ---
<rdf:RDF
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
      xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
      xmlns:foaf="http://xmlns.com/foaf/0.1/"
      xmlns:geom="http://fabl.net/vocabularies/geometry/1.1/"
      xmlns:geom2d="http://fabl.net/vocabularies/geometry2d/1.1/"
      xmlns:map="http://fabl.net/vocabularies/geography/map/1.1/"
      xmlns:ff="http://www.funkfeuer.at/vocab#"
      xmlns:graphl="http://www.mediavirus.org/graphl#">
      
<graphl:City graphl:name="Vienna">
    <foaf:depiction>
        <map:Map rdf:ID="viennamap">
            <map:image rdf:resource="map.jpg"/>
            <map:coverage>
            	<geom2d:Box>
                    <geom:xmin>0</geom:xmin>
                    <geom:ymin>-100</geom:ymin>
                    <geom:xmax>200</geom:xmax>
                    <geom:ymax>100</geom:ymax>
                </geom2d:Box>
            </map:coverage>
            <ff:transformation>
                <ff:Matrix3 ff:matrix3="6670.69   -556.921 -81782
                                        -257.162 -8739.2   425918
                                           0         0          1"/>
<!-- so bekommt man die matrix:
3 punkte in GPS-coords als spaltenvektoren aufschreiben, z=1
3 punkte im target-image (pixelkoordinaten von rechts oben) als spaltenvektoren aufschreiben, z=1

die drei gps-vektoren zu einer 3x3 matrix zusammenfassen (nebeneinanderschreiben) => matrix A
detto mit pixelkoords => matrix B

gesuchte matrix M = B . A^-1

ausrechen mit z.B. http://www.math.com/students/tools => matrices
-->
            </ff:transformation> 
        </map:Map>
    </foaf:depiction>
</graphl:City>
    
<geo:Point 
    geo:lat="48.207306"
    geo:long="16.295778"><!-- 72 433 -->
    <ff:map rdf:resource="map.rdf#viennamap"/>
</geo:Point>
<geo:Point 
    geo:lat="48.213500"
    geo:long="16.356444"
    geo:alt="0"><!-- 491 350 -->
    <ff:map rdf:resource="map.rdf#viennamap"/>
</geo:Point>
<geo:Point 
    geo:lat="48.206139"
    geo:long="16.323444"><!-- 277 432 -->
    <ff:map rdf:resource="map.rdf#viennamap"/>
</geo:Point>
<geo:Point 
    geo:lat="48.197306"
    geo:long="16.347861"><!-- 425 507 -->
    <ff:map rdf:resource="map.rdf#viennamap"/>
</geo:Point>
<geo:Point 
    geo:lat="48.224028"
    geo:long="16.373028"><!-- 578 267 ??? -->
    <ff:map rdf:resource="map.rdf#viennamap"/>
</geo:Point>

        
</rdf:RDF>

--- NEW FILE: test-config.rdf ---
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE rdf:RDF [
    <!ENTITY foo 'http://www.mediavirus.org/foo#'>
    <!ENTITY graphl 'http://www.mediavirus.org/graphl#'>
    <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'>
    <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
    <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
    <!ENTITY owl 'http://www.w3.org/2002/07/owl#'>
    <!ENTITY map 'http://fabl.net/vocabularies/geography/map/1.1/'>
    <!ENTITY geo 'http://www.w3.org/2003/01/geo/wgs84_pos#'>
]>

<rdf:RDF xml:base=""
    xmlns:foo="&foo;"
    xmlns:graphl="&graphl;"
    xmlns:foaf="&foaf;"
    xmlns:rdf="&rdf;"
    xmlns:rdfs="&rdfs;"
    xmlns:owl="&owl;"
    xmlns:map="&map;"
    xmlns:geo="&geo;"
>

<graphl:Configuration
	graphl:name="Default"
	graphl:public="true"
	graphl:default="true"
	rdf:nodeID="defaultConfig">
	
	<graphl:vocabularies>
		<graphl:Vocabulary>
			<graphl:contains>
				<graphl:Vocabulary
					graphl:name="FOAF"
					graphl:description="Friend-of-a-friend Vocabulary"
					graphl:defaultNamespacePrefix="rdf"
					graphl:namespace="&rdf;">
					<owl:imports rdf:resource="vocabs/foaf-owl.rdf"/>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Contact Properties">
							<graphl:contains rdf:resource="&foaf;phone"/>
							<graphl:contains rdf:resource="&foaf;mbox"/>
							<graphl:contains rdf:resource="&foaf;homepage"/>
							<graphl:contains rdf:resource="&foaf;workplaceHomepage"/>
							<graphl:contains rdf:resource="&foaf;workInfoHomepage"/>
							<graphl:contains rdf:resource="&foaf;schoolHomepage"/>
							<graphl:contains rdf:resource="&foaf;weblog"/>
							<graphl:contains rdf:resource="&foaf;tipjar"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Experience Properties">
							<graphl:contains rdf:resource="&foaf;currentProject"/>
							<graphl:contains rdf:resource="&foaf;pastProject"/>
							<graphl:contains rdf:resource="&foaf;made"/>
							<graphl:contains rdf:resource="&foaf;maker"/>
							<graphl:contains rdf:resource="&foaf;interest"/>
							<graphl:contains rdf:resource="&foaf;topic_interest"/>
							<graphl:contains rdf:resource="&foaf;publications"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Networking Properties">
							<graphl:contains rdf:resource="&foaf;knows"/>
							<graphl:contains rdf:resource="&foaf;member"/>
							<graphl:contains rdf:resource="&foaf;basedNear"/>
							<graphl:contains rdf:resource="&foaf;fundedBy"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Imaging Properties">
							<graphl:contains rdf:resource="&foaf;img"/>
							<graphl:contains rdf:resource="&foaf;depiction"/>
							<graphl:contains rdf:resource="&foaf;depicts"/>
							<graphl:contains rdf:resource="&foaf;thumbnail"/>
							<graphl:contains rdf:resource="&foaf;logo"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Topic Properties">
							<graphl:contains rdf:resource="&foaf;topic"/>
							<graphl:contains rdf:resource="&foaf;primaryTopic"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:ClassGroup
							graphl:name="Agent Classes">
							<graphl:contains rdf:resource="&foaf;Person"/>
							<graphl:contains rdf:resource="&foaf;Agent"/>
						</graphl:ClassGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:ClassGroup
							graphl:name="Group Classes">
							<graphl:contains rdf:resource="&foaf;Group"/>
							<graphl:contains rdf:resource="&foaf;Project"/>
							<graphl:contains rdf:resource="&foaf;Organization"/>
						</graphl:ClassGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:ClassGroup
							graphl:name="Document Classes">
							<graphl:contains rdf:resource="&foaf;Document"/>
							<graphl:contains rdf:resource="&foaf;Image"/>
							<graphl:contains rdf:resource="&foaf;PersonalProfileDocument"/>
						</graphl:ClassGroup>
					</graphl:contains>
				</graphl:Vocabulary>
			</graphl:contains>
			
			<graphl:contains>
				<graphl:Vocabulary
					graphl:name="RDF"
					graphl:description="RDF Core Vocabulary"
					graphl:defaultNamespacePrefix="rdf"
					graphl:namespace="&rdf;">
					<owl:imports rdf:resource="vocabs/rdf+rdfs.rdf"/>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Type Properties">
							<graphl:contains rdf:resource="&rdf;type"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Value Properties">
							<graphl:contains rdf:resource="&rdf;value"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="List Properties">
							<graphl:contains rdf:resource="&rdf;first"/>
							<graphl:contains rdf:resource="&rdf;rest"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Statement Properties">
							<graphl:contains rdf:resource="&rdf;subject"/>
							<graphl:contains rdf:resource="&rdf;predicate"/>
							<graphl:contains rdf:resource="&rdf;object"/>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:ClassGroup
							graphl:name="RDF Classes">
							<graphl:contains rdf:resource="&rdf;Statement"/>
							<graphl:contains rdf:resource="&rdf;Property"/>
						</graphl:ClassGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:ClassGroup
							graphl:name="Container Classes">
							<graphl:contains rdf:resource="&rdf;Bag"/>
							<graphl:contains rdf:resource="&rdf;Seq"/>
							<graphl:contains rdf:resource="&rdf;List"/>
						</graphl:ClassGroup>
					</graphl:contains>
				</graphl:Vocabulary>
			</graphl:contains>
			<graphl:contains>
				<graphl:Vocabulary
					graphl:name="graphl"
					graphl:description="graphl Configuration Vocabulary"
					graphl:defaultNamespacePrefix="graphl"
					graphl:namespace="&graphl;">
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Configuration Properties">
							<graphl:contains>
								<rdf:Property
									rdf:about="&graphl;contains"
									rdfs:label="contains" 
									rdfs:comment="A resource that belongs to this entity"/>
							</graphl:contains>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:ClassGroup
							graphl:name="Vocabulary Classes">
							<graphl:contains>
								<rdfs:Class
									rdf:about="&graphl;Vocabulary"
									rdfs:label="Vocabulary"
									rdfs:comment="A Vocabulary"/>
							</graphl:contains>
							<graphl:contains>
								<rdfs:Class
									rdf:about="&graphl;PropertyGroup"
									rdfs:label="Property Group"
									rdfs:comment="A group of related properties"/>
							</graphl:contains>
							<graphl:contains>
								<rdfs:Class
									rdf:about="&graphl;ClassGroup"
									rdfs:label="Class Group"
									rdfs:comment="A group of related classes"/>
							</graphl:contains>
						</graphl:ClassGroup>
					</graphl:contains>
				</graphl:Vocabulary>
			</graphl:contains>

			<graphl:contains>
				<graphl:Vocabulary
					graphl:name="rdfs"
					graphl:description="RDF Schema Vocabulary"
					graphl:defaultNamespacePrefix="rdfs"
					graphl:namespace="&rdfs;">
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Annotation Properties">
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;label"
									rdfs:label="Label" 
									rdfs:comment="A Human-readable label of some schema element"/>
							</graphl:contains>
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;comment"
									rdfs:label="Comment" 
									rdfs:comment="A Comment regarding some schema element"/>
							</graphl:contains>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Linking Properties">
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;seeAlso"
									rdfs:label="see also" 
									rdfs:comment="A document containing more information"/>
							</graphl:contains>
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;isDefinedBy"
									rdfs:label="is defined by" 
									rdfs:comment="A Document defining the entity"/>
							</graphl:contains>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Inheritance Properties">
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;subClassOf"
									rdfs:label="Subclass of" 
									rdfs:comment="The super class of this class"/>
							</graphl:contains>
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;subPropertyOf"
									rdfs:label="Sub-property of" 
									rdfs:comment=""/>
							</graphl:contains>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:PropertyGroup
							graphl:name="Data Properties">
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;member"
									rdfs:label="Member" 
									rdfs:comment="A Member"/>
							</graphl:contains>
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;domain"
									rdfs:label="Domain" 
									rdfs:comment="The domain of the given property"/>
							</graphl:contains>
							<graphl:contains>
								<rdf:Property
									rdf:about="&rdfs;range"
									rdfs:label="Range" 
									rdfs:comment="The range of the given property"/>
							</graphl:contains>
						</graphl:PropertyGroup>
					</graphl:contains>
					<graphl:contains>
						<graphl:ClassGroup
							graphl:name="RDFS Classes">
							<graphl:contains>
								<rdfs:Class
									rdf:about="&rdfs;Class"
									rdfs:label="Class"
									rdfs:comment="A Class"/>
							</graphl:contains>
							<graphl:contains>
								<rdfs:Class
									rdf:about="&rdfs;Resource"
									rdfs:label="Resource"
									rdfs:comment="A Resource"/>
							</graphl:contains>
							<graphl:contains>
								<rdfs:Class
									rdf:about="&rdfs;Literal"
									rdfs:label="Literal"
									rdfs:comment="A Literal"/>
							</graphl:contains>
							<graphl:contains>
								<rdfs:Class
									rdf:about="&rdfs;Container"
									rdfs:label="Container"
									rdfs:comment="A Container"/>
							</graphl:contains>
						</graphl:ClassGroup>
					</graphl:contains>
				</graphl:Vocabulary>
			</graphl:contains>
		</graphl:Vocabulary>
	</graphl:vocabularies>

    <graphl:availableNodeLayouters>
        <rdf:Bag>
            <rdf:li>
                <graphl:NodeLayouter
                    graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter">
                </graphl:NodeLayouter>
            </rdf:li>
            <rdf:li>
                <graphl:NodeLayouter
                    graphl:javaClass="org.mediavirus.graphl.layout.RepulsionNodeLayouter">
                </graphl:NodeLayouter>
            </rdf:li>
            <rdf:li>
                <graphl:NodeLayouter
                    graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter">
                </graphl:NodeLayouter>
            </rdf:li>
            <rdf:li>
                <graphl:NodeLayouter
                    graphl:javaClass="org.mediavirus.graphl.layout.SortedNodeLayouter">
                </graphl:NodeLayouter>
            </rdf:li>
        </rdf:Bag>
    </graphl:availableNodeLayouters> 
    
    <graphl:availableNodePainters>
        <rdf:Bag>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter">
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.ImageNodePainter">
                    <graphl:defaultImage>
                        <graphl:Image rdf:about="http://www.mediavirus.org/graphl/images/default.gif"/>
                    </graphl:defaultImage>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.InvisibleNodePainter">
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter">
                </graphl:NodePainter>
            </rdf:li>
        </rdf:Bag>
    </graphl:availableNodePainters> 
        
    <graphl:availableEdgeLayouters>
        <rdf:Bag>
            <rdf:li>
                <graphl:EdgeLayouter
                    graphl:javaClass="org.mediavirus.graphl.layout.SpringEdgeLayouter">
                </graphl:EdgeLayouter>
            </rdf:li>
            <rdf:li>
                <graphl:EdgeLayouter
                    graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter">
                </graphl:EdgeLayouter>
            </rdf:li>
            <rdf:li>
                <graphl:EdgeLayouter
                    graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter">
                </graphl:EdgeLayouter>
            </rdf:li>
        </rdf:Bag>
    </graphl:availableEdgeLayouters>
       
    <graphl:availableEdgePainters>
        <rdf:Bag>
            <rdf:li>
                <graphl:EdgePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter">
                </graphl:EdgePainter>
            </rdf:li>
            <rdf:li>
                <graphl:EdgePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.ManhattanEdgePainter">
                </graphl:EdgePainter>
            </rdf:li>
            <rdf:li>
                <graphl:EdgePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.InvisibleEdgePainter">
                </graphl:EdgePainter>
            </rdf:li>
        </rdf:Bag>
    </graphl:availableEdgePainters>

    <graphl:defaultNodePainter>
       <graphl:NodePainter
            graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
            graphl:baseColor="#f0f0f0"
            graphl:stroke="1.0"
            graphl:label="concat('[ ',graphl:name(rdf:type/to/@rdf:id),' ] ',graphl:name(@rdf:id))">
        </graphl:NodePainter>
    </graphl:defaultNodePainter>
   
    <graphl:defaultEdgePainter>
       <graphl:EdgePainter
            graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"
            graphl:paintArrow="true"
            graphl:paintLabel="true"
            graphl:color="#000000"
            graphl:labelColor="#000000"
            graphl:label="graphl:name(@graphl:type)"/>
    </graphl:defaultEdgePainter>
   
    <graphl:defaultNodeLayouter>
       <graphl:NodeLayouter
            graphl:javaClass="org.mediavirus.graphl.layout.RepulsionNodeLayouter"
            graphl:strength="1.0"/>
    </graphl:defaultNodeLayouter>
   
    <graphl:defaultEdgeLayouter>
       <graphl:EdgeLayouter
            graphl:javaClass="org.mediavirus.graphl.layout.SpringEdgeLayouter"
            graphl:length="300.0"
            graphl:rigidity="1.0"/>
    </graphl:defaultEdgeLayouter>
   
    <graphl:assignedNodePainters>
        <rdf:Bag>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
                    graphl:baseColor="#d0d0d0"
                    graphl:borderColor="#000000"
                    graphl:font="14"
                    graphl:borderStroke="1.5"
                    graphl:label="@foaf:name">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foaf;Person"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
                    graphl:baseColor="#d0d0d0"
                    graphl:borderColor="#000000"
                    graphl:font="14"
                    graphl:borderStroke="1.5 5 2"
                    graphl:label="@foaf:name">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foaf;Group"/>
                    </graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foaf;Organization"/>
                    </graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foaf;Project"/>
                    </graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foo;Institution"/>
                    </graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foo;Network"/>
                    </graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foo;Company"/>
                    </graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foo;Exhibition"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
                    graphl:baseColor="#f9f9f9"
                    graphl:borderColor="#d0d0d0"
                    graphl:textColor="#909090"
                    graphl:borderStroke="1.0"
                    graphl:useBorderColor="true"
                    graphl:roundRect="false"
                    graphl:font="Dialog-8"
                    graphl:label="graphl:name(@rdf:id)">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&foaf;Document"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
                    graphl:baseColor="#e0e0e0"
                    graphl:label="graphl:name(@rdf:id)">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&rdfs;Class"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
                    graphl:baseColor="#f0f0f0"
                    graphl:label="graphl:name(@rdf:id)">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&rdf;Property"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.ImageNodePainter"
                    graphl:method="property"
                    graphl:property="&map;image">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&map;Map"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter"
                    graphl:shape="X">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&geo;Point"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter"
                    graphl:shape="circle">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&rdf;List"/>
                    </graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&rdf;Bag"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.ShapeNodePainter"
                    graphl:shape="circle"
                    graphl:color="#ff0000">
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&rdf;nil"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
        </rdf:Bag>
    </graphl:assignedNodePainters>
    
    <graphl:assignedNodeLayouters>
    	<rdf:Bag>
    		<rdf:li>
    			<graphl:NodeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter"
    				graphl:width="map:coverage/to/@geom:xmax - map:coverage/to/@geom:xmin"
    				graphl:height="map:coverage/to/@geom:ymax - map:coverage/to/@geom:ymin">
    				<graphl:assignedToType>
    					<rdfs:Class rdf:about="&map;Map"/>
    				</graphl:assignedToType>
    			</graphl:NodeLayouter>
    		</rdf:li>
    		<rdf:li>
    			<graphl:NodeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter"
    				graphl:x="@geo:lon"
    				graphl:y="@geo:lat"
    				graphl:transformation="">
    				<graphl:assignedToType>
    					<rdfs:Class rdf:about="&geo;Point"/>
    				</graphl:assignedToType>
    			</graphl:NodeLayouter>
    		</rdf:li>
    	</rdf:Bag>
    </graphl:assignedNodeLayouters>
    				
    <graphl:assignedEdgePainters>
    	<rdf:Bag>
    		<rdf:li>
    			<graphl:EdgePainter
    				graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"
    				graphl:paintArrow="false"
    				graphl:paintLabel="false"
    				graphl:stroke="1.0 1 5">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;type"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;isDefinedBy"/>
    				</graphl:assignedToType>
    			</graphl:EdgePainter>
            </rdf:li>
    		<rdf:li>
    			<graphl:EdgePainter
    				graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"
    				graphl:paintArrow="false"
    				graphl:paintLabel="false"
    				graphl:stroke="1.0 5 5"
    				graphl:color="#ff0000">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&owl;inverseOf"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&owl;disjointWith"/>
    				</graphl:assignedToType>
    			</graphl:EdgePainter>
            </rdf:li>
    		<rdf:li>
    			<graphl:EdgePainter
    				graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"
    				graphl:paintArrow="false"
    				graphl:paintLabel="false"
    				graphl:stroke="1.0 5 5">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;range"/>
    				</graphl:assignedToType>
    			</graphl:EdgePainter>
            </rdf:li>
    		<rdf:li>
    			<graphl:EdgePainter
    				graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"
    				graphl:paintArrow="false"
    				graphl:paintLabel="false"
    				graphl:stroke="1.5 5 5">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&foaf;knows"/>
    				</graphl:assignedToType>
    			</graphl:EdgePainter>
            </rdf:li>
            <rdf:li>
    			<graphl:EdgePainter
    				graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"
    				graphl:paintArrow="false"
    				graphl:paintLabel="false"
    				graphl:stroke="1.0">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;first"/>
    				</graphl:assignedToType>
    			</graphl:EdgePainter>
            </rdf:li>
            <rdf:li>
    			<graphl:EdgePainter
    				graphl:javaClass="org.mediavirus.graphl.painter.StraightLineEdgePainter"
    				graphl:paintArrow="true"
    				graphl:paintLabel="false"
    				graphl:stroke="1.0">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;rest"/>
    				</graphl:assignedToType>
    			</graphl:EdgePainter>
    		</rdf:li>
    	</rdf:Bag>
    </graphl:assignedEdgePainters>
    				
    <graphl:assignedEdgeLayouters>
    	<rdf:Bag>
    		<rdf:li>
    			<graphl:EdgeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;type"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;range"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;isDefinedBy"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&owl;disjointWith"/>
    				</graphl:assignedToType>
    			</graphl:EdgeLayouter>
    		</rdf:li>
    		<rdf:li>
    			<graphl:EdgeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter"
    				graphl:direction="up">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;subClassOf"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;subPropertyOf"/>
    				</graphl:assignedToType>
    			</graphl:EdgeLayouter>
    		</rdf:li>
    		<rdf:li>
    			<graphl:EdgeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter"
    				graphl:direction="right">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;rest"/>
    				</graphl:assignedToType>
    			</graphl:EdgeLayouter>
    		</rdf:li>
    		<rdf:li>
    			<graphl:EdgeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.DirectedEdgeLayouter"
    				graphl:direction="down"
    				graphl:length="100.0">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;first"/>
    				</graphl:assignedToType>
    			</graphl:EdgeLayouter>
    		</rdf:li>
    	</rdf:Bag>
    </graphl:assignedEdgeLayouters>
    				
       
</graphl:Configuration>

<graphl:Configuration
	graphl:name="Hide Schema"
	graphl:public="true"
	rdf:nodeID="hideSchemaConfig">
	
	<graphl:basedOn rdf:nodeID="defaultConfig"/>

    <graphl:assignedNodePainters>
        <rdf:Bag>
            <rdf:li>
                <graphl:NodePainter
                    graphl:javaClass="org.mediavirus.graphl.painter.InvisibleNodePainter">
    				<graphl:assignedToType>
    					<rdfs:Class rdf:about="&rdfs;Class"/>
    				</graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&rdf;Property"/>
                    </graphl:assignedToType>
                </graphl:NodePainter>
            </rdf:li>
        </rdf:Bag>
    </graphl:assignedNodePainters>
                    

    <graphl:assignedNodeLayouters>
    	<rdf:Bag>
    		<rdf:li>
    			<graphl:NodeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter">
    				<graphl:assignedToType>
    					<rdfs:Class rdf:about="&rdfs;Class"/>
    				</graphl:assignedToType>
                    <graphl:assignedToType>
                        <rdfs:Class rdf:about="&rdf;Property"/>
                    </graphl:assignedToType>
    			</graphl:NodeLayouter>
    		</rdf:li>
    	</rdf:Bag>
    </graphl:assignedNodeLayouters>
	
    <graphl:assignedEdgePainters>
    	<rdf:Bag>
            <rdf:li>
    			<graphl:EdgePainter
    				graphl:javaClass="org.mediavirus.graphl.painter.InvisibleEdgePainter">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;type"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;isDefinedBy"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;range"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;subClassOf"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;subPropertyOf"/>
    				</graphl:assignedToType>
    			</graphl:EdgePainter>    	
    		</rdf:li>
    	</rdf:Bag>
    </graphl:assignedEdgePainters>
	
    <graphl:assignedEdgeLayouters>
    	<rdf:Bag>
    		<rdf:li>
    			<graphl:EdgeLayouter
    				graphl:javaClass="org.mediavirus.graphl.layout.NeutralEdgeLayouter">
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdf;type"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;range"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;isDefinedBy"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;subClassOf"/>
    				</graphl:assignedToType>
    				<graphl:assignedToType>
    					<rdf:Property rdf:about="&rdfs;subPropertyOf"/>
    				</graphl:assignedToType>
    			</graphl:EdgeLayouter>
    		</rdf:li>
    	
    	</rdf:Bag>
    </graphl:assignedEdgeLayouters>

</graphl:Configuration>

</rdf:RDF>
--- NEW FILE: map.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: test.rdf ---
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE rdf:RDF [
    <!ENTITY graphl 'http://www.mediavirus.org/graphl#'>
    <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'>
    <!ENTITY ff 'http://www.funkfeuer.at/vocab#'>
    <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
    <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
    <!ENTITY vs 'http://www.w3.org/2003/06/sw-vocab-status/ns#'>
    <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
]>

<rdf:RDF xml:base=""
    xmlns:graphl="&graphl;"
    xmlns:foaf="&foaf;"
    xmlns:ff="&ff;"
    xmlns:rdf="&rdf;"
    xmlns:rdfs="&rdfs;"
    xmlns:vs="&vs;"
    xmlns:dc="&dc;">

<rdf:Description rdf:about="#"><rdfs:seeAlso rdf:resource="geo.rdf"/></rdf:Description>

</rdf:RDF>

[graphl-cvs] graphl/graphs test.rdf tube_model2.rdf geo.rdf

From: Flo L. <fl...@us...> - 2006-06-08 13:15:05

Update of /cvsroot/graphl/graphl/graphs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17343/graphs

Modified Files:
	test.rdf 
Removed Files:
	tube_model2.rdf geo.rdf 
Log Message:
a lot of changes done a long time ago... changelog has to be updated another time :(

--- tube_model2.rdf DELETED ---

--- geo.rdf DELETED ---

Index: test.rdf
===================================================================
RCS file: /cvsroot/graphl/graphl/graphs/test.rdf,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test.rdf	18 Dec 2005 11:11:41 -0000	1.8
--- test.rdf	8 Jun 2006 13:15:01 -0000	1.9
***************
*** 3,14 ****
      <!ENTITY graphl 'http://www.mediavirus.org/graphl#'>
      <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'>
!     <!ENTITY foo 'http://www.mediavirus.org/foo#'>
      <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
-     <!ENTITY map 'http://fabl.net/vocabularies/geography/map/1.1/'>
-     <!ENTITY owl 'http://www.w3.org/2002/07/owl#'>
      <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
      <!ENTITY vs 'http://www.w3.org/2003/06/sw-vocab-status/ns#'>
-     <!ENTITY wot 'http://xmlns.com/wot/0.1/'>
-     <!ENTITY geo 'http://www.w3.org/2003/01/geo/wgs84_pos#'>
      <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
  ]>
--- 3,10 ----
      <!ENTITY graphl 'http://www.mediavirus.org/graphl#'>
      <!ENTITY foaf 'http://xmlns.com/foaf/0.1/'>
!     <!ENTITY ff 'http://www.funkfeuer.at/vocab#'>
      <!ENTITY rdf 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
      <!ENTITY rdfs 'http://www.w3.org/2000/01/rdf-schema#'>
      <!ENTITY vs 'http://www.w3.org/2003/06/sw-vocab-status/ns#'>
      <!ENTITY dc 'http://purl.org/dc/elements/1.1/'>
  ]>
***************
*** 17,53 ****
      xmlns:graphl="&graphl;"
      xmlns:foaf="&foaf;"
!     xmlns:foo="&foo;"
      xmlns:rdf="&rdf;"
-     xmlns:map="&map;"
-     xmlns:owl="&owl;"
      xmlns:rdfs="&rdfs;"
      xmlns:vs="&vs;"
-     xmlns:wot="&wot;"
-     xmlns:geo="&geo;"
      xmlns:dc="&dc;">
  
! <rdf:Description rdf:about="&foaf;Person"
!     rdfs:comment="A person."
!     vs:term_status="testing"
!     rdfs:label="Person"/>
! <foaf:Person rdf:ID="genid1"
!     foaf:name="Maxi">
!     <foaf:knows rdf:resource="#genid2"/>
!     <foaf:knows rdf:resource="#genid4"/>
!     <foaf:knows rdf:resource="#genid5"/>
!     <graphl:connectedTo rdf:resource="#genid6"/>
!     <foaf:knows rdf:resource="#genid7"/>
! </foaf:Person>
! <foaf:Person rdf:ID="genid2"
!     foaf:name="Susi">
!     <foaf:knows rdf:resource="#genid3"/>
! </foaf:Person>
! <foaf:Person rdf:ID="genid7"
!     foaf:name="bar"/>
! <foaf:Person rdf:ID="genid112"
!     foaf:name="baz">
!     <foaf:knows rdf:resource="#genid7" rdf:ID="test"/>
! </foaf:Person>
! <rdf:Description rdf:about="#test" foo:since="1"/>
  
  </rdf:RDF>
--- 13,28 ----
      xmlns:graphl="&graphl;"
      xmlns:foaf="&foaf;"
!     xmlns:ff="&ff;"
      xmlns:rdf="&rdf;"
      xmlns:rdfs="&rdfs;"
      xmlns:vs="&vs;"
      xmlns:dc="&dc;">
  
! <rdf:Description rdf:ID="genid40"
!     rdf:id="#genid40">
!     <foaf:phone rdf:resource="#genid82"/>
! </rdf:Description>
! <rdf:Description rdf:ID="genid82"
!     rdf:id="#genid82"/>
  
  </rdf:RDF>

[graphl-cvs] graphl/web/config/vocabs/SOUPA - New directory

From: Flo L. <fl...@us...> - 2006-06-08 13:13:11

Update of /cvsroot/graphl/graphl/web/config/vocabs/SOUPA
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17286/web/config/vocabs/SOUPA

Log Message:
Directory /cvsroot/graphl/graphl/web/config/vocabs/SOUPA added to the repository

[graphl-cvs] graphl/web/config/vocabs - New directory

From: Flo L. <fl...@us...> - 2006-06-08 13:13:11

Update of /cvsroot/graphl/graphl/web/config/vocabs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17286/web/config/vocabs

Log Message:
Directory /cvsroot/graphl/graphl/web/config/vocabs added to the repository

[graphl-cvs] graphl/test - New directory

From: Flo L. <fl...@us...> - 2006-06-08 13:13:08

Update of /cvsroot/graphl/graphl/test
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17286/test

Log Message:
Directory /cvsroot/graphl/graphl/test added to the repository

[graphl-cvs] graphl/src/org/mediavirus/graphl/interaction GraphlManipulator.java

From: Flo L. <fl...@us...> - 2005-12-18 13:30:09

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23462/src/org/mediavirus/graphl/interaction

Modified Files:
	GraphlManipulator.java 
Log Message:
fixed small regression bug in node creation

Index: GraphlManipulator.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction/GraphlManipulator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GraphlManipulator.java	18 Dec 2005 11:11:41 -0000	1.14
--- GraphlManipulator.java	18 Dec 2005 13:30:00 -0000	1.15
***************
*** 123,129 ****
      	Edge clickEdge = graphPane.getHoverEdge();
      	
!     	if (e.getClickCount() == 2) {  //(e.getWhen() - lastClick) < 300) {
  			if ((clickNode == null) && (clickEdge == null)) {
  				final Node newNode = graphPane.getFilteredGraph().createNode();
  				clickNode = newNode;
  				clickNode.setCenter(p.getX(), p.getY());
--- 123,130 ----
      	Edge clickEdge = graphPane.getHoverEdge();
      	
!     	if (e.getClickCount() == 2) {
  			if ((clickNode == null) && (clickEdge == null)) {
  				final Node newNode = graphPane.getFilteredGraph().createNode();
+                 graphPane.getFilteredGraph().addElements(Collections.singleton(newNode), null);
  				clickNode = newNode;
  				clickNode.setCenter(p.getX(), p.getY());
***************
*** 244,248 ****
  				Point d = new Point();
  			    graphPane.screenToGraphPoint(dragStart,d);
! 				((DefaultGraph)graphPane.getSourceGraph()).addElements(Collections.singleton(newNode), Collections.singleton(edge)); 
  				
  				TypeMenu nodeTypeMenu = new TypeMenu("New Node", graphPane.getVocabularies());
--- 245,249 ----
  				Point d = new Point();
  			    graphPane.screenToGraphPoint(dragStart,d);
! 				graphPane.getFilteredGraph().addElements(Collections.singleton(newNode), Collections.singleton(edge)); 
  				
  				TypeMenu nodeTypeMenu = new TypeMenu("New Node", graphPane.getVocabularies());

[graphl-cvs] graphl/config config.rdf

From: Flo L. <fl...@us...> - 2005-12-18 13:29:23

Update of /cvsroot/graphl/graphl/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23369/config

Modified Files:
	config.rdf 
Log Message:
changed label definitions from old facet implementation to RXPath

Index: config.rdf
===================================================================
RCS file: /cvsroot/graphl/graphl/config/config.rdf,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** config.rdf	7 Sep 2005 11:47:51 -0000	1.15
--- config.rdf	18 Dec 2005 13:29:13 -0000	1.16
***************
*** 419,441 ****
              graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
              graphl:baseColor="#f0f0f0"
!             graphl:stroke="1.0">
!             <graphl:labelGenerator>
!                 <graphl:LabelGenerator>
!                     <graphl:labelFacets rdf:parseType="Collection">
!                         <!--<graphl:LabelFacet
!                             graphl:labelFacetType="Value"
!                             graphl:guessName="true"/>-->
!                         <graphl:LabelFacet
!                             graphl:labelFacetType="String"
!                             graphl:labelFacetValue=" [ "/>
!                         <graphl:LabelFacet
!                             graphl:labelFacetType="Type"
!                             graphl:guessName="true"/>
!                         <graphl:LabelFacet
!                             graphl:labelFacetType="String"
!                             graphl:labelFacetValue=" ] "/>
!                     </graphl:labelFacets>
!                 </graphl:LabelGenerator>
!             </graphl:labelGenerator>
          </graphl:NodePainter>
      </graphl:defaultNodePainter>
--- 419,424 ----
              graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
              graphl:baseColor="#f0f0f0"
!             graphl:stroke="1.0"
!             graphl:label="concat('[ ',graphl:guessName(rdf:type/to/@rdf:id),' ] ',graphl:guessName(@rdf:id))">
          </graphl:NodePainter>
      </graphl:defaultNodePainter>
***************
*** 447,451 ****
              graphl:paintLabel="true"
              graphl:color="#000000"
!             graphl:labelColor="#000000"/>
      </graphl:defaultEdgePainter>
     
--- 430,435 ----
              graphl:paintLabel="true"
              graphl:color="#000000"
!             graphl:labelColor="#000000"
!             graphl:label="graphl:guessName(@graphl:type)"/>
      </graphl:defaultEdgePainter>
     
***************
*** 471,484 ****
                      graphl:borderColor="#000000"
                      graphl:font="14"
!                     graphl:borderStroke="1.5">
!                     <graphl:labelGenerator>
!                         <graphl:LabelGenerator rdf:ID="TEST">
!                             <graphl:labelFacets rdf:parseType="Collection">
!                                  <graphl:LabelFacet
!                                             graphl:labelFacetType="Property"
!                                             graphl:labelFacetValue="&foaf;name"/>
!                             </graphl:labelFacets>
!                         </graphl:LabelGenerator>
!                     </graphl:labelGenerator>
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&foaf;Person"/>
--- 455,460 ----
                      graphl:borderColor="#000000"
                      graphl:font="14"
!                     graphl:borderStroke="1.5"
!                     graphl:label="@foaf:name">
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&foaf;Person"/>
***************
*** 492,505 ****
                      graphl:borderColor="#000000"
                      graphl:font="14"
!                     graphl:borderStroke="1.5 5 2">
!                     <graphl:labelGenerator>
!                         <graphl:LabelGenerator>
!                             <graphl:labelFacets rdf:parseType="Collection">
!                                  <graphl:LabelFacet
!                                             graphl:labelFacetType="Property"
!                                             graphl:labelFacetValue="&foaf;name"/>
!                             </graphl:labelFacets>
!                         </graphl:LabelGenerator>
!                     </graphl:labelGenerator>
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&foaf;Group"/>
--- 468,473 ----
                      graphl:borderColor="#000000"
                      graphl:font="14"
!                     graphl:borderStroke="1.5 5 2"
!                     graphl:label="@foaf:name">
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&foaf;Group"/>
***************
*** 534,547 ****
                      graphl:useBorderColor="true"
                      graphl:roundRect="false"
!                     graphl:font="Dialog-8">
!                     <graphl:labelGenerator>
!                         <graphl:LabelGenerator>
!                             <graphl:labelFacets rdf:parseType="Collection">
!                                  <graphl:LabelFacet
!                                             graphl:labelFacetType="Value"
!                                             graphl:guessName="false"/>
!                             </graphl:labelFacets>
!                         </graphl:LabelGenerator>
!                     </graphl:labelGenerator>
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&foaf;Document"/>
--- 502,507 ----
                      graphl:useBorderColor="true"
                      graphl:roundRect="false"
!                     graphl:font="Dialog-8"
!                     graphl:label="graphl:guessName(@rdf:id)">
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&foaf;Document"/>
***************
*** 552,565 ****
                  <graphl:NodePainter
                      graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
!                     graphl:baseColor="#e0e0e0">
!                     <graphl:labelGenerator>
!                         <graphl:LabelGenerator>
!                             <graphl:labelFacets rdf:parseType="Collection">
!                                 <graphl:LabelFacet
!                                     graphl:labelFacetType="Value"
!                                     graphl:guessName="true"/>
!                             </graphl:labelFacets>
!                         </graphl:LabelGenerator>
!                     </graphl:labelGenerator>
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&rdfs;Class"/>
--- 512,517 ----
                  <graphl:NodePainter
                      graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
!                     graphl:baseColor="#e0e0e0"
!                     graphl:label="graphl:guessName(@rdf:id)">
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&rdfs;Class"/>
***************
*** 570,583 ****
                  <graphl:NodePainter
                      graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
!                     graphl:baseColor="#f0f0f0">
!                     <graphl:labelGenerator>
!                         <graphl:LabelGenerator>
!                             <graphl:labelFacets rdf:parseType="Collection">
!                                 <graphl:LabelFacet
!                                     graphl:labelFacetType="Value"
!                                     graphl:guessName="true"/>
!                             </graphl:labelFacets>
!                         </graphl:LabelGenerator>
!                     </graphl:labelGenerator>
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&rdf;Property"/>
--- 522,527 ----
                  <graphl:NodePainter
                      graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
!                     graphl:baseColor="#f0f0f0"
!                     graphl:label="graphl:guessName(@rdf:id)">
                      <graphl:assignedToType>
                          <rdfs:Class rdf:about="&rdf;Property"/>
***************
*** 587,614 ****
              <rdf:li>
                  <graphl:NodePainter
-                     graphl:javaClass="org.mediavirus.graphl.painter.BoxNodePainter"
-                     graphl:baseColor="#f0f0f0">
-                     <graphl:labelGenerator>
-                         <graphl:LabelGenerator>
-                             <graphl:labelFacets rdf:parseType="Collection">
-                                 <graphl:LabelFacet
-                                     graphl:labelFacetType="Property"
-                                     graphl:labelFacetValue="&graphl;labelFacetType"/>
-                                 <graphl:LabelFacet
-                                     graphl:labelFacetType="String"
-                                     graphl:labelFacetValue=" "/>
-                                 <graphl:LabelFacet
-                                     graphl:labelFacetType="Property"
-                                     graphl:labelFacetValue="&graphl;labelFacetValue"/>
-                             </graphl:labelFacets>
-                         </graphl:LabelGenerator>
-                     </graphl:labelGenerator>
-                     <graphl:assignedToType>
-                         <rdfs:Class rdf:about="&graphl;LabelFacet"/>
-                     </graphl:assignedToType>
-                 </graphl:NodePainter>
-             </rdf:li>
-             <rdf:li>
-                 <graphl:NodePainter
                      graphl:javaClass="org.mediavirus.graphl.painter.ImageNodePainter"
                      graphl:method="property"
--- 531,534 ----
***************
*** 657,671 ****
      		<rdf:li>
      			<graphl:NodeLayouter
-     				graphl:javaClass="org.mediavirus.graphl.layout.UnconstrainedNodeLayouter">
-     				<graphl:assignedToType>
-     					<rdfs:Class rdf:about="&rdf;nil"/>
-     				</graphl:assignedToType>
-     				<graphl:assignedToType>
-     					<rdfs:Class rdf:about="&graphl;LabelFacet"/>
-     				</graphl:assignedToType>
-     			</graphl:NodeLayouter>
-     		</rdf:li>
-     		<rdf:li>
-     			<graphl:NodeLayouter
      				graphl:javaClass="org.mediavirus.graphl.layout.AbsoluteNodeLayouter"
      				graphl:method="property"
--- 577,580 ----

[graphl-cvs] graphl/config/vocabs foaf-owl.rdf rdf+rdfs.rdf

From: Flo L. <fl...@us...> - 2005-12-18 13:26:31

Update of /cvsroot/graphl/graphl/config/vocabs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22944/config/vocabs

Modified Files:
	foaf-owl.rdf rdf+rdfs.rdf 
Log Message:
commented out external includes

Index: rdf+rdfs.rdf
===================================================================
RCS file: /cvsroot/graphl/graphl/config/vocabs/rdf+rdfs.rdf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rdf+rdfs.rdf	11 Jan 2005 13:19:11 -0000	1.1
--- rdf+rdfs.rdf	18 Dec 2005 13:26:22 -0000	1.2
***************
*** 233,239 ****
--- 233,241 ----
  </rdfs:Datatype>
  
+ <!--
  <rdf:Description rdf:about="http://www.w3.org/2000/01/rdf-schema#">
    <rdfs:seeAlso rdf:resource="http://www.w3.org/2000/01/rdf-schema-more"/>
  </rdf:Description>
+ -->
  
  </rdf:RDF>
\ No newline at end of file

Index: foaf-owl.rdf
===================================================================
RCS file: /cvsroot/graphl/graphl/config/vocabs/foaf-owl.rdf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** foaf-owl.rdf	17 Aug 2005 15:52:54 -0000	1.2
--- foaf-owl.rdf	18 Dec 2005 13:26:22 -0000	1.3
***************
*** 10,14 ****
  <!-- Here we describe general characteristics of the FOAF vocabulary ('ontology'). -->
    <owl:Ontology rdf:about="http://xmlns.com/foaf/0.1/" dc:title="Friend of a Friend (FOAF) vocabulary" dc:description="The Friend of a Friend (FOAF) RDF vocabulary, described using W3C RDF Schema and the Web Ontology Language." dc:date="$Date$">
!     <rdfs:seeAlso rdf:resource="http://www.w3.org/2001/08/rdfweb/foaf"/>
      <!--<owl:imports rdf:resource="http://www.w3.org/2000/01/rdf-schema"/>
      <owl:imports rdf:resource="http://www.w3.org/2002/07/owl"/>-->
--- 10,14 ----
  <!-- Here we describe general characteristics of the FOAF vocabulary ('ontology'). -->
    <owl:Ontology rdf:about="http://xmlns.com/foaf/0.1/" dc:title="Friend of a Friend (FOAF) vocabulary" dc:description="The Friend of a Friend (FOAF) RDF vocabulary, described using W3C RDF Schema and the Web Ontology Language." dc:date="$Date$">
!     <!--<rdfs:seeAlso rdf:resource="http://www.w3.org/2001/08/rdfweb/foaf"/>-->
      <!--<owl:imports rdf:resource="http://www.w3.org/2000/01/rdf-schema"/>
      <owl:imports rdf:resource="http://www.w3.org/2002/07/owl"/>-->

[graphl-cvs] graphl/lib commons-jxpath-1.2.jar

From: Flo L. <fl...@us...> - 2005-12-18 13:25:45

Update of /cvsroot/graphl/graphl/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22820/lib

Added Files:
	commons-jxpath-1.2.jar 
Log Message:
added jxpath library file

--- NEW FILE: commons-jxpath-1.2.jar ---
(This appears to be a binary file; contents omitted.)

[graphl-cvs] graphl .classpath

From: Flo L. <fl...@us...> - 2005-12-18 13:25:45

Update of /cvsroot/graphl/graphl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22820

Modified Files:
	.classpath 
Log Message:
added jxpath library file

Index: .classpath
===================================================================
RCS file: /cvsroot/graphl/graphl/.classpath,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** .classpath	18 Dec 2005 11:11:41 -0000	1.7
--- .classpath	18 Dec 2005 13:25:36 -0000	1.8
***************
*** 7,11 ****
  	<classpathentry sourcepath="C:/Programme/java/l2fprod-common-0.1-dev/src" kind="lib" path="lib/l2fprod-common-fontchooser.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
! 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JXPath"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
--- 7,11 ----
  	<classpathentry sourcepath="C:/Programme/java/l2fprod-common-0.1-dev/src" kind="lib" path="lib/l2fprod-common-fontchooser.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
! 	<classpathentry sourcepath="C:/lib/commons-jxpath-1.2/src/java" kind="lib" path="lib/commons-jxpath-1.2.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>

[graphl-cvs] graphl changelog.txt

From: Flo L. <fl...@us...> - 2005-12-18 11:13:45

Update of /cvsroot/graphl/graphl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3036

Modified Files:
	changelog.txt 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: changelog.txt
===================================================================
RCS file: /cvsroot/graphl/graphl/changelog.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** changelog.txt	18 Dec 2005 11:11:41 -0000	1.20
--- changelog.txt	18 Dec 2005 11:13:25 -0000	1.21
***************
*** 5,8 ****
--- 5,10 ----
  - FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
  - CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
+ - CODE: Remove LabelGenerator classes - this can now done with RXPath
+ - CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance
  
  2005-12-14, f/0:

[graphl-cvs] graphl/src/org/mediavirus/graphl/vocabulary ResourceGroup.java NS.java AbstractVocabulary.java VocabularyRegistry.java SimpleVocabularyRegistry.java Vocabulary.java

From: Flo L. <fl...@us...> - 2005-12-18 11:12:28

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/vocabulary

Modified Files:
	ResourceGroup.java NS.java AbstractVocabulary.java 
	VocabularyRegistry.java SimpleVocabularyRegistry.java 
	Vocabulary.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: ResourceGroup.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/ResourceGroup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResourceGroup.java	4 Oct 2004 10:21:01 -0000	1.2
--- ResourceGroup.java	18 Dec 2005 11:11:39 -0000	1.3
***************
*** 16,20 ****
  
      String description;
!     Vector resources = new Vector();
      
      /**
--- 16,20 ----
  
      String description;
!     Vector<ResourceDescriptor> resources = new Vector<ResourceDescriptor>();
      
      /**

Index: SimpleVocabularyRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/SimpleVocabularyRegistry.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleVocabularyRegistry.java	21 Oct 2004 16:00:49 -0000	1.5
--- SimpleVocabularyRegistry.java	18 Dec 2005 11:11:40 -0000	1.6
***************
*** 6,10 ****
  
  import java.util.Enumeration;
! import java.util.Iterator;
  import java.util.Vector;
  
--- 6,11 ----
  
  import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.Map;
  import java.util.Vector;
  
***************
*** 17,21 ****
  public class SimpleVocabularyRegistry implements VocabularyRegistry {
  
!     Vector registeredVocabularies = new Vector();
      
  	/**
--- 18,25 ----
  public class SimpleVocabularyRegistry implements VocabularyRegistry {
  
!     Vector<Vocabulary> registeredVocabularies = new Vector<Vocabulary>();
!     
!     Map<String, String> prefixToNamespaceMap = new HashMap<String, String>();
!     Map<String, String> namespaceToPrefixMap = new HashMap<String, String>();
      
  	/**
***************
*** 31,65 ****
  	public void registerVocabulary(Vocabulary v) {
  		registeredVocabularies.add(v);
  	}
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#expandNamespace(java.lang.String)
       */    
!     public String expandNamespace(String uri) {
!         int pos = uri.indexOf(':');
!         if (pos == -1) return uri;
!         String prefix = uri.substring(0,pos);
!         for (Iterator iter = registeredVocabularies.iterator(); iter.hasNext();) {
!             Vocabulary vocab = (Vocabulary) iter.next();
!             if (vocab.getDefaultNamespacePrefix().equals(prefix)) {
!                 return vocab.getNamespace() + uri.substring(pos+1);
!             }
!         }
!         return uri;
      }
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#compactNamespace(java.lang.String)
       */
      public String compactNamespace(String uri) {
!         String prefix = ParseUtils.guessNamespace(uri);
!         if (prefix == null) return uri;
!         for (Iterator iter = registeredVocabularies.iterator(); iter.hasNext();) {
!             Vocabulary vocab = (Vocabulary) iter.next();
!             if (vocab.getNamespace().equals(prefix)) {
!                 return vocab.getDefaultNamespacePrefix() + ":" + ParseUtils.guessName(uri);
!             }
!         }
!         return uri;
      }
  
--- 35,79 ----
  	public void registerVocabulary(Vocabulary v) {
  		registeredVocabularies.add(v);
+         registerNamespace(v.getNamespacePrefix(), v.getNamespace());
  	}
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#resolveNamespace(java.lang.String)
       */    
!     public String resolveNamespace(String prefix) {
!         return prefixToNamespaceMap.get(prefix);
!     }
! 
!     public String resolvePrefix(String uri) {
!         return namespaceToPrefixMap.get(uri);
      }
  
      /**
!      * @see org.mediavirus.graphl.vocabulary.VocabularyRegistry#expandPrefix(java.lang.String)
       */
+     public String expandPrefix(String qname) {
+         String prefix = ParseUtils.guessNamespace(qname);
+         if (prefix == null) return qname;
+         prefix = prefix.substring(0,prefix.length()-1); // strip ":"
+         String ns = prefixToNamespaceMap.get(prefix);
+         if (ns != null) return ns + ParseUtils.guessName(qname);
+         else return qname;
+     }
+ 
      public String compactNamespace(String uri) {
!         String ns = ParseUtils.guessNamespace(uri);
!         if (ns == null) return uri;
!         String prefix = namespaceToPrefixMap.get(ns);
!         if (prefix != null) return prefix + ":" + ParseUtils.guessName(uri);
!         else return uri;
!     }
! 
!     public void registerNamespace(String prefix, String uri) {
!         prefixToNamespaceMap.put(prefix, uri);
!         namespaceToPrefixMap.put(uri,prefix);
!     }
! 
!     public Map<String, String> getNamespaces() {
!         return prefixToNamespaceMap;
      }
  

Index: Vocabulary.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/Vocabulary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Vocabulary.java	30 Nov 2004 09:38:33 -0000	1.3
--- Vocabulary.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 21,25 ****
      public String getNamespace();
      
!     public String getDefaultNamespacePrefix();
      
      public String getName();
--- 21,25 ----
      public String getNamespace();
      
!     public String getNamespacePrefix();
      
      public String getName();

Index: NS.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/NS.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NS.java	5 Sep 2005 15:49:19 -0000	1.3
--- NS.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 12,14 ****
--- 12,15 ----
  	public static final String foaf = "http://xmlns.com/foaf/0.1/";
  	public static final String rdfs = "http://www.w3.org/2000/01/rdf-schema#";
+     public static final String rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
  }

Index: VocabularyRegistry.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/VocabularyRegistry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VocabularyRegistry.java	14 Oct 2004 13:03:05 -0000	1.3
--- VocabularyRegistry.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 7,10 ****
--- 7,11 ----
  
  import java.util.Enumeration;
+ import java.util.Map;
  
  
***************
*** 23,28 ****
      public void registerVocabulary(Vocabulary v);
      
!     public String expandNamespace(String uri);
      
      public String compactNamespace(String uri);
  }
\ No newline at end of file
--- 24,37 ----
      public void registerVocabulary(Vocabulary v);
      
!     public void registerNamespace(String prefix, String uri);
      
+     public String resolveNamespace(String prefix);
+     
+     public String resolvePrefix(String uri);
+ 
+     public String expandPrefix(String qname);
+ 
      public String compactNamespace(String uri);
+     
+     public Map<String, String> getNamespaces();
  }
\ No newline at end of file

Index: AbstractVocabulary.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/vocabulary/AbstractVocabulary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractVocabulary.java	4 Oct 2004 10:21:01 -0000	1.2
--- AbstractVocabulary.java	18 Dec 2005 11:11:40 -0000	1.3
***************
*** 20,25 ****
      String description;
  
!     Vector propertyGroups = new Vector();
!     Vector resourceGroups = new Vector();
  
      public void addPropertyGroup(ResourceGroup props){
--- 20,25 ----
      String description;
  
!     Vector<ResourceGroup> propertyGroups = new Vector<ResourceGroup>();
!     Vector<ResourceGroup> resourceGroups = new Vector<ResourceGroup>();
  
      public void addPropertyGroup(ResourceGroup props){
***************
*** 43,47 ****
      }
      
!     public String getDefaultNamespacePrefix() {
          return defaultNamespacePrefix;
      }
--- 43,47 ----
      }
      
!     public String getNamespacePrefix() {
          return defaultNamespacePrefix;
      }

[graphl-cvs] graphl/src/org/mediavirus/graphl/painter ImageNodePainter.java StraightLineEdgePainter.java BoxNodePainter.java ShapeNodePainter.java LineEdgePainter.java ManhattanEdgePainter.java

From: Flo L. <fl...@us...> - 2005-12-18 11:12:28

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/painter

Modified Files:
	ImageNodePainter.java StraightLineEdgePainter.java 
	BoxNodePainter.java ShapeNodePainter.java LineEdgePainter.java 
	ManhattanEdgePainter.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: LineEdgePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/LineEdgePainter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LineEdgePainter.java	17 Aug 2005 15:52:51 -0000	1.9
--- LineEdgePainter.java	18 Dec 2005 11:11:40 -0000	1.10
***************
*** 12,20 ****
  import java.awt.Rectangle;
  import java.awt.Stroke;
  
  import org.mediavirus.graphl.GraphlPane;
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
- import org.mediavirus.graphl.view.LabelGenerator;
  import org.mediavirus.graphl.vocabulary.NS;
  import org.mediavirus.util.ParseUtils;
--- 12,22 ----
  import java.awt.Rectangle;
  import java.awt.Stroke;
+ import java.util.HashMap;
  
+ import org.apache.commons.jxpath.ClassFunctions;
+ import org.apache.commons.jxpath.JXPathContext;
  import org.mediavirus.graphl.GraphlPane;
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.vocabulary.NS;
  import org.mediavirus.util.ParseUtils;
***************
*** 33,43 ****
  	 * @uml.property name="invertArrow" 
  	 */
! 	protected boolean invertArrow = false;
! 
! 	
  
  	Stroke stroke;
  	Stroke highlightedStroke;
  	Stroke selectedStroke;
  	
  	Font font;
--- 35,46 ----
  	 * @uml.property name="invertArrow" 
  	 */
! 	protected boolean invertArrow = false;	
  
  	Stroke stroke;
  	Stroke highlightedStroke;
  	Stroke selectedStroke;
+     
+     String widthExpr;
+     String labelExpr;
  	
  	Font font;
***************
*** 45,49 ****
  	Color labelColor = Color.BLACK;
  	
!     LabelGenerator labelGenerator;
  
  	/**
--- 48,53 ----
  	Color labelColor = Color.BLACK;
  	
!     HashMap<Edge, Stroke> strokeCache = new HashMap<Edge, Stroke>();
!     HashMap<Edge, String> labelCache = new HashMap<Edge, String>();
  
  	/**
***************
*** 62,67 ****
  		this.color = color;
  		this.font = font;
- 		
- 		labelGenerator = new LabelGenerator(LabelGenerator.TYPE,"",true);
  	}
  
--- 66,69 ----
***************
*** 69,75 ****
  		//DraggingManipulator draggingManipulator = (DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME);
  		//boolean isDragging = draggingManipulator!=null && draggingManipulator.getDraggedEdge()==edge;
! 
! 		boolean isDragging = false;
! 		doPaintEdge(graphPane, g, edge, selected, highlighted);
  	}
  
--- 71,100 ----
  		//DraggingManipulator draggingManipulator = (DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME);
  		//boolean isDragging = draggingManipulator!=null && draggingManipulator.getDraggedEdge()==edge;
!         
!         Stroke oldStroke = getStroke();
!         
!         if (widthExpr != null) {
!             Stroke dynStroke = strokeCache.get(edge);
!             if (dynStroke == null) {
!                 JXPathContext context = JXPathContext.newContext(edge);
!                 context.setLenient(true);
!                 Object widthO = context.getValue(widthExpr);
!                 try {
!                     double width = ((Double)widthO).doubleValue();
!                     BasicStroke bs = (BasicStroke)stroke;
!                     dynStroke = new BasicStroke((float) width, bs.getEndCap(), bs.getLineJoin(), bs.getMiterLimit(), bs.getDashArray(), bs.getDashPhase());
!                     strokeCache.put(edge, dynStroke);
!                 }
!                 catch (Exception ex) {}
!             }
!             if (dynStroke != null) setStroke(dynStroke);
!             doPaintEdge(graphPane, g, edge, selected, highlighted);            
!             setStroke(oldStroke);
!         }
!         else {
!             doPaintEdge(graphPane, g, edge, selected, highlighted);            
!         }
!         
!         
  	}
  
***************
*** 173,188 ****
      }
      /**
-      * @return Returns the labelGenerator.
-      */
-     public LabelGenerator getLabelGenerator() {
-         return labelGenerator;
-     }
-     /**
-      * @param labelGenerator The labelGenerator to set.
-      */
-     public void setLabelGenerator(LabelGenerator labelGenerator) {
-         this.labelGenerator = labelGenerator;
-     }
-     /**
       * @param stroke The stroke to set.
       */
--- 198,201 ----
***************
*** 236,239 ****
--- 249,268 ----
          return stroke;
      }
+     
+     public String getLabel(Edge edge) {
+         String label = labelCache.get(edge);
+         if (label == null) {
+             if (labelExpr != null) {
+                 JXPathContext context = JXPathContext.newContext(edge);
+                 context.setFunctions(new ClassFunctions(ParseUtils.class, "graphl"));
+                 context.setLenient(true);
+                 Object labelO = context.getValue(labelExpr);
+                 if (labelO instanceof String) {
+                     label = (String) labelO;
+                 }
+             }
+         }
+         return label;
+     }
  
    	public abstract boolean isPointInLabel(GraphlPane graphPane, Edge edge, Point point);
***************
*** 267,270 ****
--- 296,322 ----
  		if (stroke != null) setStroke(stroke);
  
+         widthExpr = node.getProperty(NS.graphl + "width");
+         labelExpr = node.getProperty(NS.graphl + "label");
+         
  	}
+ 
+     
+     public String getLabelExpr() {
+         return labelExpr;
+     }
+ 
+     
+     public void setLabelExpr(String labelExpr) {
+         this.labelExpr = labelExpr;
+     }
+ 
+     
+     public String getWidthExpr() {
+         return widthExpr;
+     }
+ 
+     
+     public void setWidthExpr(String widthExpr) {
+         this.widthExpr = widthExpr;
+     }
  }

Index: ImageNodePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ImageNodePainter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ImageNodePainter.java	17 Aug 2005 15:52:51 -0000	1.7
--- ImageNodePainter.java	18 Dec 2005 11:11:40 -0000	1.8
***************
*** 48,52 ****
      int height = 20;
      
!     static Hashtable images = new Hashtable();
      
      public ImageNodePainter() {
--- 48,52 ----
      int height = 20;
      
!     static Hashtable<Node, Image> images = new Hashtable<Node, Image>();
      
      public ImageNodePainter() {
***************
*** 179,183 ****
      public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) {
  
!         // TODO (2) implement this
          return false;
      }
--- 179,183 ----
      public boolean isEdgeDragPoint(GraphlPane graphPane, Node node, Point p) {
  
!         // TODO (2) implement ImageNodePainter.isEdgeDragPoint()
          return false;
      }

Index: StraightLineEdgePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/StraightLineEdgePainter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StraightLineEdgePainter.java	5 Sep 2005 15:48:39 -0000	1.8
--- StraightLineEdgePainter.java	18 Dec 2005 11:11:40 -0000	1.9
***************
*** 142,146 ****
  					if (isPaintLabel()){
  					    g.setColor(getLabelColor());
! 						String label = labelGenerator.getLabel(edge);
  						if (label != null){
  							Font oldfont = g.getFont();
--- 142,146 ----
  					if (isPaintLabel()){
  					    g.setColor(getLabelColor());
! 						String label = getLabel(edge);
  						if (label != null){
  							Font oldfont = g.getFont();
***************
*** 304,315 ****
          return (p instanceof StraightLineEdgePainter);
      }
- 
-     /*
-      * Overrides @see org.mediavirus.graphl.view.GraphlEdgePainter#getLength(org.mediavirus.graphl.RDFEdge)
-      */
-     public double getLength(Edge edge) {
-         return edge.getLength();
-     }
- 
- 
  }
--- 304,306 ----

Index: ShapeNodePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ShapeNodePainter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ShapeNodePainter.java	17 Aug 2005 15:52:51 -0000	1.6
--- ShapeNodePainter.java	18 Dec 2005 11:11:40 -0000	1.7
***************
*** 206,212 ****
  			    setShape(CROSS);
  			}
! 			else if (str.equalsIgnoreCase("circle")) {
! 			    setShape(CIRCLE);
! 			}
  		}
  		
--- 206,215 ----
  			    setShape(CROSS);
  			}
!             else if (str.equalsIgnoreCase("circle")) {
!                 setShape(CIRCLE);
!             }
!             else if (str.equalsIgnoreCase("square")) {
!                 setShape(SQUARE);
!             }
  		}
  		

Index: ManhattanEdgePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/ManhattanEdgePainter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ManhattanEdgePainter.java	30 Nov 2004 09:38:34 -0000	1.5
--- ManhattanEdgePainter.java	18 Dec 2005 11:11:40 -0000	1.6
***************
*** 12,16 ****
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
- import org.mediavirus.graphl.graph.rdf.RDFEdge;
  
  /**
--- 12,15 ----
***************
*** 135,145 ****
      }
  
-     /*
-      * @see org.mediavirus.graphl.view.GraphlEdgePainter#getLength(org.mediavirus.graphl.RDFEdge)
-      */
-     public double getLength(RDFEdge edge) {
-         return edge.getLength();
-     }
-     
- 
  }
--- 134,136 ----

Index: BoxNodePainter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/painter/BoxNodePainter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BoxNodePainter.java	17 Aug 2005 15:52:51 -0000	1.10
--- BoxNodePainter.java	18 Dec 2005 11:11:40 -0000	1.11
***************
*** 13,21 ****
  import java.awt.Rectangle;
  import java.awt.Stroke;
  
  import org.mediavirus.graphl.GraphlPane;
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
- import org.mediavirus.graphl.view.LabelGenerator;
  import org.mediavirus.graphl.vocabulary.NS;
  import org.mediavirus.util.ParseUtils;
--- 13,24 ----
  import java.awt.Rectangle;
  import java.awt.Stroke;
+ import java.util.HashMap;
+ import java.util.Map;
  
+ import org.apache.commons.jxpath.ClassFunctions;
+ import org.apache.commons.jxpath.JXPathContext;
  import org.mediavirus.graphl.GraphlPane;
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.vocabulary.NS;
  import org.mediavirus.util.ParseUtils;
***************
*** 38,42 ****
      int cornerRadius = 8;
      
!     LabelGenerator labelGenerator;
      
      public BoxNodePainter(){
--- 41,47 ----
      int cornerRadius = 8;
      
!     //LabelGenerator labelGenerator;
!     String labelExpr;
!     Map<Node, String> labelCache = new HashMap<Node, String>();
      
      public BoxNodePainter(){
***************
*** 47,51 ****
  		baseColor = new Color(255,250,168);
  		textColor = Color.BLACK;
! 		labelGenerator = new LabelGenerator();
      }
      
--- 52,56 ----
  		baseColor = new Color(255,250,168);
  		textColor = Color.BLACK;
! 		//labelGenerator = new LabelGenerator();
      }
      
***************
*** 79,82 ****
--- 84,97 ----
  	}
  
+     
+     public String getLabelExpr() {
+         return labelExpr;
+     }
+ 
+     
+     public void setLabelExpr(String labelExpr) {
+         this.labelExpr = labelExpr;
+     }
+ 
      /**
       * @return Returns the borderStroke.
***************
*** 205,209 ****
      public void paintNode(GraphlPane graphPane,Graphics2D g,Node node, boolean selected, boolean highlighted) {
          //DraggingManipulator draggingManipulator=(DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME);
!         boolean isDragging=false; //draggingManipulator!=null && draggingManipulator.getDraggedNode()==node;
          Point nodePoint=graphPane.getScreenPointForNode(node);
          int width=1;
--- 220,224 ----
      public void paintNode(GraphlPane graphPane,Graphics2D g,Node node, boolean selected, boolean highlighted) {
          //DraggingManipulator draggingManipulator=(DraggingManipulator)graphPane.getManipulator(DraggingManipulator.NAME);
!         //boolean isDragging=false; //draggingManipulator!=null && draggingManipulator.getDraggedNode()==node;
          Point nodePoint=graphPane.getScreenPointForNode(node);
          int width=1;
***************
*** 211,215 ****
          int textX=0;
          int textY=0;
!         String label = labelGenerator.getLabel(node);
          g.setStroke(borderStroke);
          if (label!=null) {
--- 226,232 ----
          int textX=0;
          int textY=0;
!         
!         String label = getLabel(node);
!         
          g.setStroke(borderStroke);
          if (label!=null) {
***************
*** 261,265 ****
      public void getNodeScreenBounds(GraphlPane graphPane,Node node,Rectangle nodeScreenRectangle) {
          Point nodePoint=graphPane.getScreenPointForNode(node);
!         String label = labelGenerator.getLabel(node);
          int width=1;
          int height=1;
--- 278,282 ----
      public void getNodeScreenBounds(GraphlPane graphPane,Node node,Rectangle nodeScreenRectangle) {
          Point nodePoint=graphPane.getScreenPointForNode(node);
!         String label = getLabel(node);
          int width=1;
          int height=1;
***************
*** 276,279 ****
--- 293,312 ----
      }
  
+     private String getLabel(Node node) {
+         String label = labelCache.get(node);
+         if (label == null) {
+             if (labelExpr != null) {
+                 JXPathContext context = JXPathContext.newContext(node);
+                 context.setFunctions(new ClassFunctions(ParseUtils.class, "graphl"));
+                 context.setLenient(true);
+                 Object labelO = context.getValue(labelExpr);
+                 if (labelO instanceof String) {
+                     label = (String) labelO;
+                 }
+             }
+         }
+         return label;
+     }
+ 
      public boolean isEdgeDragPoint(GraphlPane graphPane,Node node,Point p) {
  	    Rectangle r = new Rectangle();
***************
*** 336,346 ****
  		if (font != null) setFont(font);
  		
! 		try {
! 			Node labelGeneratorNode = (Node)node.getNeighbours(NS.graphl + "labelGenerator", true).get(0);
! 			labelGenerator.setConfigurationNode(labelGeneratorNode);
! 		}
! 		catch (IndexOutOfBoundsException ioobex) {
! 			// no such neighbour found
! 		}
  		
  		Stroke stroke = ParseUtils.parseStroke(node.getProperty(NS.graphl + "borderStroke"));
--- 369,379 ----
  		if (font != null) setFont(font);
  		
! //		try {
! //			Node labelGeneratorNode = (Node)node.getNeighbours(NS.graphl + "labelGenerator", true).get(0);
! //			labelGenerator.setConfigurationNode(labelGeneratorNode);
! //		}
! //		catch (IndexOutOfBoundsException ioobex) {
! //			// no such neighbour found
! //		}
  		
  		Stroke stroke = ParseUtils.parseStroke(node.getProperty(NS.graphl + "borderStroke"));
***************
*** 353,358 ****
  		if (str != null) setUseBorderColor(str.equalsIgnoreCase("true"));
  		
! 		str = node.getProperty(NS.graphl + "cornerRadius");
! 		if (str != null) setCornerRadius(Integer.parseInt(str));
  	}
  	
--- 386,394 ----
  		if (str != null) setUseBorderColor(str.equalsIgnoreCase("true"));
  		
!         str = node.getProperty(NS.graphl + "cornerRadius");
!         if (str != null) setCornerRadius(Integer.parseInt(str));
!         
!         str = node.getProperty(NS.graphl + "label");
!         if (str != null) setLabelExpr(str);
  	}

[graphl-cvs] graphl/src/org/mediavirus/graphl/graph DefaultElement.java DefaultGraph.java Node.java GraphListener.java DefaultNode.java Edge.java AbstractGraph.java Graph.java DefaultEdge.java

From: Flo L. <fl...@us...> - 2005-12-18 11:12:27

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/graph

Modified Files:
	DefaultElement.java DefaultGraph.java Node.java 
	GraphListener.java DefaultNode.java Edge.java 
	AbstractGraph.java Graph.java DefaultEdge.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: DefaultEdge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultEdge.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DefaultEdge.java	5 Sep 2005 15:50:40 -0000	1.14
--- DefaultEdge.java	18 Dec 2005 11:11:40 -0000	1.15
***************
*** 16,20 ****
      protected Node to;
      
!     HashMap properties = new HashMap();
      
      String id;
--- 16,20 ----
      protected Node to;
      
!     HashMap<String, String> properties = new HashMap<String, String>();
      
      String id;
***************
*** 77,97 ****
          zIndex = index;
      }
- 	/**
- 	 * The length of an Edge is an abstract value, that can be used for layouting and rendering the edge.
- 	 * @return The length of this Edge.
- 	 */
- 	public double getLength() {
- 		return length;
- 	}
- 
- 	/**
- 	 * Sets the Edge's length. The length of an Edge is an abstract value, that
- 	 * can be used for layouting and rendering the edge.
- 	 * @param length The length to set.
- 	 */
- 	public void setLength(double length) {
- 		this.length = length;
- 	}
- 
      
  	/**
--- 77,80 ----
***************
*** 100,103 ****
--- 83,87 ----
  	public void setType(String type) {
  		this.type = type;
+         setProperty(NS.graphl + "type", type);
  	}
  

Index: Node.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Node.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Node.java	5 Sep 2005 15:42:17 -0000	1.12
--- Node.java	18 Dec 2005 11:11:40 -0000	1.13
***************
*** 16,21 ****
       * @return                              the list of edges from the node
       */
!     List getEdgesFrom();
!     List getEdgesFrom(String type);
      /**
       * Returns the list of edges to the node.
--- 16,21 ----
       * @return                              the list of edges from the node
       */
!     List<Edge> getEdgesFrom();
!     List<Edge> getEdgesFrom(String type);
      /**
       * Returns the list of edges to the node.
***************
*** 23,30 ****
       * @return                              the list of edges to the node
       */
!     List getEdgesTo();
!     List getEdgesTo(String type);
      
!     List getNeighbours(String edgeType, boolean forwardOnly);
      Node getFirstNeighbour(String edgeType, boolean forwardOnly);
  
--- 23,30 ----
       * @return                              the list of edges to the node
       */
!     List<Edge> getEdgesTo();
!     List<Edge> getEdgesTo(String type);
      
!     List<Node> getNeighbours(String edgeType, boolean forwardOnly);
      Node getFirstNeighbour(String edgeType, boolean forwardOnly);
  

Index: Graph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Graph.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Graph.java	24 Aug 2005 16:11:50 -0000	1.6
--- Graph.java	18 Dec 2005 11:11:40 -0000	1.7
***************
*** 36,40 ****
       * @return                      the list of the nodes in the graph
       */
!     List getNodes();
      /**
       * Returns a collection of the edges in the graph. The order of the list reflects the Z-order of nodes in the graph.
--- 36,40 ----
       * @return                      the list of the nodes in the graph
       */
!     List<Node> getNodes();
      /**
       * Returns a collection of the edges in the graph. The order of the list reflects the Z-order of nodes in the graph.
***************
*** 42,46 ****
       * @return                      the list of the edges in the graph
       */
!     List getEdges();
  	
  	public Node createNode();
--- 42,46 ----
       * @return                      the list of the edges in the graph
       */
!     List<Edge> getEdges();
  	
  	public Node createNode();
***************
*** 49,53 ****
  	public Edge createEdge(Node from, Node to);
  	
! 	public void addElements(Collection nodes, Collection edges);
  
  }
--- 49,53 ----
  	public Edge createEdge(Node from, Node to);
  	
! 	public void addElements(Collection<Node> nodes, Collection<Edge> edges);
  
  }

Index: Edge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/Edge.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Edge.java	17 Aug 2005 15:52:50 -0000	1.12
--- Edge.java	18 Dec 2005 11:11:40 -0000	1.13
***************
*** 29,39 ****
  	void setSource(String source);
  
-     /**
-      * Returns the length of this edge.
-      *
-      * @return                      the length of the edge
-      */
-     double getLength();
- 
  	/**
  	 * @return The edge painter that is set for rendering this edge.
--- 29,32 ----

Index: GraphListener.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/GraphListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GraphListener.java	21 Jun 2004 18:48:06 -0000	1.1
--- GraphListener.java	18 Dec 2005 11:11:40 -0000	1.2
***************
*** 33,37 ****
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsAdded(Graph graph,Collection nodes,Collection edges);
      /**
       * Called when elements are removed from the graph.
--- 33,37 ----
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsAdded(Graph graph, Collection<Node> nodes, Collection<Edge> edges);
      /**
       * Called when elements are removed from the graph.
***************
*** 41,44 ****
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsRemoved(Graph graph,Collection nodes,Collection edges);
  }
--- 41,44 ----
       * @param edges                     the edges added (may be <code>null</code>)
       */
!     void elementsRemoved(Graph graph, Collection<Node> nodes, Collection<Edge> edges);
  }

Index: DefaultGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultGraph.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultGraph.java	17 Aug 2005 15:52:50 -0000	1.4
--- DefaultGraph.java	18 Dec 2005 11:11:40 -0000	1.5
***************
*** 11,17 ****
  public class DefaultGraph extends AbstractGraph {
      /** Nodes of the graph. */
!     protected List allNodes;
      /** Edges of the graph. */
!     protected List allEdges;
      
      protected boolean loading = false;
--- 11,17 ----
  public class DefaultGraph extends AbstractGraph {
      /** Nodes of the graph. */
!     protected List<Node> allNodes;
      /** Edges of the graph. */
!     protected List<Edge> allEdges;
      
      protected boolean loading = false;
***************
*** 21,26 ****
       */
      public DefaultGraph() {
!         allNodes=new LinkedList();
!         allEdges=new LinkedList();
      }
      /**
--- 21,26 ----
       */
      public DefaultGraph() {
!         allNodes=new LinkedList<Node>();
!         allEdges=new LinkedList<Edge>();
      }
      /**
***************
*** 29,33 ****
       * @return                      a collection of the nodes in the graph
       */
!     public List getNodes() {
          return allNodes;
      }
--- 29,33 ----
       * @return                      a collection of the nodes in the graph
       */
!     public List<Node> getNodes() {
          return allNodes;
      }
***************
*** 37,41 ****
       * @return                      the collection of the edges in the graph
       */
!     public List getEdges() {
          return allEdges;
      }
--- 37,41 ----
       * @return                      the collection of the edges in the graph
       */
!     public List<Edge> getEdges() {
          return allEdges;
      }
***************
*** 46,52 ****
       * @param edges                 the edges added to the graph (may be <code>null</code>)
       */
!     public synchronized void addElements(Collection nodes,Collection edges) {
          if (nodes!=null) {
!             Iterator iterator=nodes.iterator();
              while (iterator.hasNext()) {
                  DefaultNode node=(DefaultNode)iterator.next();
--- 46,52 ----
       * @param edges                 the edges added to the graph (may be <code>null</code>)
       */
!     public synchronized void addElements(Collection<Node> nodes, Collection<Edge> edges) {
          if (nodes!=null) {
!             Iterator<Node> iterator=nodes.iterator();
              while (iterator.hasNext()) {
                  DefaultNode node=(DefaultNode)iterator.next();
***************
*** 56,60 ****
          }
          if (edges!=null) {
!             Iterator iterator=edges.iterator();
              while (iterator.hasNext()) {
                  DefaultEdge edge=(DefaultEdge)iterator.next();
--- 56,60 ----
          }
          if (edges!=null) {
!             Iterator<Edge> iterator=edges.iterator();
              while (iterator.hasNext()) {
                  DefaultEdge edge=(DefaultEdge)iterator.next();
***************
*** 76,80 ****
       * @param edges                 the edges to delete (may be <code>null</code>)
       */
!     public synchronized void deleteElements(Collection nodes,Collection edges) {
          if (nodes!=null) {
              Iterator iterator=nodes.iterator();
--- 76,80 ----
       * @param edges                 the edges to delete (may be <code>null</code>)
       */
!     public synchronized void deleteElements(Collection<Node> nodes, Collection<Edge> edges) {
          if (nodes!=null) {
              Iterator iterator=nodes.iterator();

Index: AbstractGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/AbstractGraph.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractGraph.java	11 Jan 2005 13:26:41 -0000	1.3
--- AbstractGraph.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 68,72 ****
       * @param edges                 the collection of edges
       */
!     protected void fireElementsAdded(Collection nodes,Collection edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)
--- 68,72 ----
       * @param edges                 the collection of edges
       */
!     protected void fireElementsAdded(Collection<Node> nodes, Collection<Edge> edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 79,83 ****
       * @param edges                 the collection of edges
       */
!     protected void fireElementsRemoved(Collection nodes,Collection edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)
--- 79,83 ----
       * @param edges                 the collection of edges
       */
!     protected void fireElementsRemoved(Collection<Node> nodes, Collection<Edge> edges) {
          EventListener[] listeners=m_listeners.getListeners(GraphListener.class);
          for (int i=0;i<listeners.length;i++)

Index: DefaultNode.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultNode.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DefaultNode.java	5 Sep 2005 15:50:40 -0000	1.16
--- DefaultNode.java	18 Dec 2005 11:11:40 -0000	1.17
***************
*** 14,20 ****
  public class DefaultNode extends DefaultElement implements Node {
      /** The list of edges from the node. */
!     protected List edgesFrom;
      /** The list of edges to the node. */
!     protected List edgesTo;
      /** The x location of the node. */
      protected double posX;
--- 14,20 ----
  public class DefaultNode extends DefaultElement implements Node {
      /** The list of edges from the node. */
!     protected List<Edge> edgesFrom;
      /** The list of edges to the node. */
!     protected List<Edge> edgesTo;
      /** The x location of the node. */
      protected double posX;
***************
*** 62,67 ****
       */
      public DefaultNode() {
!         edgesFrom=new LinkedList();
!         edgesTo=new LinkedList();
      }
      /**
--- 62,67 ----
       */
      public DefaultNode() {
!         edgesFrom=new LinkedList<Edge>();
!         edgesTo=new LinkedList<Edge>();
      }
      /**
***************
*** 70,74 ****
       * @return                              the list of edges from the node
       */
!     public List getEdgesFrom() {
          return edgesFrom;
      }
--- 70,74 ----
       * @return                              the list of edges from the node
       */
!     public List<Edge> getEdgesFrom() {
          return edgesFrom;
      }
***************
*** 78,82 ****
       * @return                              the list of edges to the node
       */
!     public List getEdgesTo() {
          return edgesTo;
      }
--- 78,82 ----
       * @return                              the list of edges to the node
       */
!     public List<Edge> getEdgesTo() {
          return edgesTo;
      }
***************
*** 179,187 ****
  	}
  
! 	public List getEdgesFrom(String type) {
! 		List edges = new ArrayList(2);
! 		Iterator allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
--- 179,187 ----
  	}
  
! 	public List<Edge> getEdgesFrom(String type) {
! 		List<Edge> edges = new ArrayList<Edge>(2);
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
***************
*** 189,197 ****
  	}
  
! 	public List getEdgesTo(String type) {
! 		List edges = new ArrayList(2);
! 		Iterator allEdges = edgesTo.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
--- 189,197 ----
  	}
  
! 	public List<Edge> getEdgesTo(String type) {
! 		List<Edge> edges = new ArrayList<Edge>(2);
! 		Iterator<Edge> allEdges = edgesTo.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (type.equals(edge.getType())) edges.add(edge);
  		}
***************
*** 199,207 ****
  	}
  
! 	public List getNeighbours(String edgeType, boolean forwardOnly) {
! 		List nodes = new ArrayList(2);
! 		Iterator allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (edgeType.equals(edge.getType())) nodes.add(edge.getTo());
  		}
--- 199,207 ----
  	}
  
! 	public List<Node> getNeighbours(String edgeType, boolean forwardOnly) {
! 		List<Node> nodes = new ArrayList<Node>(2);
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (edgeType.equals(edge.getType())) nodes.add(edge.getTo());
  		}
***************
*** 209,213 ****
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = (Edge) allEdges.next();
  				if (edgeType.equals(edge.getType())) nodes.add(edge.getFrom());
  			}			
--- 209,213 ----
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = allEdges.next();
  				if (edgeType.equals(edge.getType())) nodes.add(edge.getFrom());
  			}			
***************
*** 217,223 ****
  
  	public Node getFirstNeighbour(String edgeType, boolean forwardOnly) {
! 		Iterator allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = (Edge) allEdges.next();
  			if (edgeType.equals(edge.getType())) return edge.getTo();
  		}
--- 217,223 ----
  
  	public Node getFirstNeighbour(String edgeType, boolean forwardOnly) {
! 		Iterator<Edge> allEdges = edgesFrom.iterator();
  		while (allEdges.hasNext()) {
! 			Edge edge = allEdges.next();
  			if (edgeType.equals(edge.getType())) return edge.getTo();
  		}
***************
*** 225,229 ****
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = (Edge) allEdges.next();
  				if (edgeType.equals(edge.getType())) return edge.getFrom();
  			}			
--- 225,229 ----
  			allEdges = edgesTo.iterator();
  			while (allEdges.hasNext()) {
! 				Edge edge = allEdges.next();
  				if (edgeType.equals(edge.getType())) return edge.getFrom();
  			}			

Index: DefaultElement.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/DefaultElement.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultElement.java	5 Sep 2005 15:50:40 -0000	1.4
--- DefaultElement.java	18 Dec 2005 11:11:40 -0000	1.5
***************
*** 14,18 ****
  public abstract class DefaultElement implements GraphElement {
  
!     HashMap properties = new HashMap();
  
  	public String getProperty(String name) {
--- 14,18 ----
  public abstract class DefaultElement implements GraphElement {
  
!     HashMap<String, String> properties = new HashMap<String, String>();
  
  	public String getProperty(String name) {

[graphl-cvs] graphl/src/org/mediavirus/graphl/gui NodeContextMenu.java EdgeContextMenu.java TypeMenu.java

From: Flo L. <fl...@us...> - 2005-12-18 11:12:25

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/gui

Modified Files:
	NodeContextMenu.java EdgeContextMenu.java TypeMenu.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: EdgeContextMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/EdgeContextMenu.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** EdgeContextMenu.java	5 Sep 2005 15:47:18 -0000	1.18
--- EdgeContextMenu.java	18 Dec 2005 11:11:40 -0000	1.19
***************
*** 17,20 ****
--- 17,21 ----
  
  import org.mediavirus.graphl.GraphlPane;
+ import org.mediavirus.graphl.GraphlRegistry;
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.layout.EdgeLayouter;
***************
*** 154,158 ****
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = graphlPane.getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();
--- 155,159 ----
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = GraphlRegistry.instance().getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();

Index: NodeContextMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/NodeContextMenu.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NodeContextMenu.java	5 Sep 2005 15:47:18 -0000	1.19
--- NodeContextMenu.java	18 Dec 2005 11:11:40 -0000	1.20
***************
*** 17,20 ****
--- 17,21 ----
  
  import org.mediavirus.graphl.GraphlPane;
+ import org.mediavirus.graphl.GraphlRegistry;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.layout.NodeLayouter;
***************
*** 158,162 ****
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = graphlPane.getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();
--- 159,163 ----
          typeSubMenu.addSeparator();
  
!         Enumeration vocabs = GraphlRegistry.instance().getVocabularyRegistry().getRegisteredVocabularies();
          while (vocabs.hasMoreElements()) {
              Vocabulary vocab = (Vocabulary) vocabs.nextElement();

Index: TypeMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/TypeMenu.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TypeMenu.java	17 Aug 2005 15:52:55 -0000	1.3
--- TypeMenu.java	18 Dec 2005 11:11:40 -0000	1.4
***************
*** 25,29 ****
  	String currentType = null;
  	
! 	ArrayList listeners = new ArrayList();
  
  	public TypeMenu() {
--- 25,29 ----
  	String currentType = null;
  	
! 	ArrayList<ResourceListener> listeners = new ArrayList<ResourceListener>();
  
  	public TypeMenu() {

[graphl-cvs] graphl/src/org/mediavirus/graphl/graph/rdf RDFGraph.java RDFNode.java RDFEdge.java

From: Flo L. <fl...@us...> - 2005-12-18 11:11:54

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/graph/rdf

Modified Files:
	RDFGraph.java RDFNode.java RDFEdge.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: RDFEdge.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFEdge.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RDFEdge.java	30 Nov 2004 09:38:34 -0000	1.4
--- RDFEdge.java	18 Dec 2005 11:11:41 -0000	1.5
***************
*** 23,38 ****
  	 * @param to The Node this Edge leads to.
  	 */
! 	public RDFEdge(Node from, Node to) {
  		super(from, to);
  	}
  
  	/**
- 	 * @return The primary value of this Edge.
- 	 */
- 	public String getLabel() {
- 		return getType();
- 	}
- 
- 	/**
  	 * @return The id of this Edge.
  	 */
--- 23,31 ----
  	 * @param to The Node this Edge leads to.
  	 */
! 	RDFEdge(Node from, Node to) {
  		super(from, to);
  	}
  
  	/**
  	 * @return The id of this Edge.
  	 */

Index: RDFNode.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RDFNode.java	7 Sep 2005 12:29:55 -0000	1.11
--- RDFNode.java	18 Dec 2005 11:11:41 -0000	1.12
***************
*** 11,14 ****
--- 11,15 ----
  
  import org.mediavirus.graphl.graph.DefaultNode;
+ import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.vocabulary.NS;
***************
*** 28,32 ****
  	}
  	
! 	public RDFNode(RDFGraph graph){
  		super();
  		
--- 29,33 ----
  	}
  	
! 	RDFNode(RDFGraph graph){
  		super();
  		
***************
*** 35,39 ****
  	}
  	
! 	public RDFNode(RDFGraph graph, String id) {
  		super();
  		
--- 36,40 ----
  	}
  	
! 	RDFNode(RDFGraph graph, String id) {
  		super();
  		
***************
*** 60,63 ****
--- 61,65 ----
  		}
  		super.setId(id);
+         setProperty(NS.rdf + "id", id);
  	}
  	
***************
*** 88,92 ****
  				// TODO (3) this should probably not be hardcoded to USER
  				typeEdge.setSource(NS.graphl + "USER");
! 				graph.addElements(null, Collections.singleton(typeEdge));
  			} catch (Exception e) {
  				e.printStackTrace();
--- 90,94 ----
  				// TODO (3) this should probably not be hardcoded to USER
  				typeEdge.setSource(NS.graphl + "USER");
! 				graph.addElements(null, Collections.singleton((Edge)typeEdge));
  			} catch (Exception e) {
  				e.printStackTrace();
***************
*** 94,102 ****
  		}
  		else {
! 			Iterator edges = new ArrayList(getEdgesFrom()).iterator();
  			while (edges.hasNext()) {
! 				RDFEdge e = (RDFEdge)edges.next();
! 				if (e.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
! 					graph.deleteElements(null,Collections.singleton(e));
  			}			
  		}
--- 96,104 ----
  		}
  		else {
! 			Iterator<Edge> edges = new ArrayList<Edge>(getEdgesFrom()).iterator();
  			while (edges.hasNext()) {
! 				RDFEdge edge = (RDFEdge)edges.next();
! 				if (edge.getType() == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
! 					graph.deleteElements(null,Collections.singleton((Edge)edge));
  			}			
  		}

Index: RDFGraph.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/graph/rdf/RDFGraph.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RDFGraph.java	14 Dec 2005 12:45:08 -0000	1.13
--- RDFGraph.java	18 Dec 2005 11:11:41 -0000	1.14
***************
*** 8,12 ****
  
  import java.io.File;
- import java.io.FileReader;
  import java.io.IOException;
  import java.io.OutputStream;
--- 8,11 ----
***************
*** 19,23 ****
--- 18,24 ----
  import java.util.Hashtable;
  import java.util.List;
+ import java.util.Map;
  
+ import org.mediavirus.graphl.GraphlRegistry;
  import org.mediavirus.graphl.graph.DefaultGraph;
  import org.mediavirus.graphl.graph.Edge;
***************
*** 42,46 ****
      boolean dirty = false;
  
!     Hashtable allNodes = new Hashtable();
  
      URL loadingURL = null;
--- 43,47 ----
      boolean dirty = false;
  
!     Hashtable<String, Node> allNodes = new Hashtable<String, Node>();
  
      URL loadingURL = null;
***************
*** 63,92 ****
          RDFWriter writer = new RDFWriter();
  
          // TODO (2) use vocabularies from config for prefix resolution
!         writer.addNamespacePrefix("graphl", NS.graphl);
!         writer.addNamespacePrefix("foaf", "http://xmlns.com/foaf/0.1/");
!         writer.addNamespacePrefix("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
!         writer.addNamespacePrefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
!         writer.addNamespacePrefix("owl", "http://www.w3.org/2002/07/owl#");
!         writer.addNamespacePrefix("map", "http://fabl.net/vocabularies/geography/map/1.1/");
!         writer.addNamespacePrefix("geo", "http://www.w3.org/2003/01/geo/wgs84_pos#");
!         writer.addNamespacePrefix("dc", "http://purl.org/dc/elements/1.1/");
!         writer.addNamespacePrefix("foo", "http://www.mediavirus.org/foo#");
!         writer.addNamespacePrefix("vs", "http://www.w3.org/2003/06/sw-vocab-status/ns#");
!         writer.addNamespacePrefix("wot", "http://xmlns.com/wot/0.1/");
  
          writer.prepareNamespaceCollection();
  
!         writer.collectNamespace(NS.graphl);
!         writer.collectNamespace("http://xmlns.com/foaf/0.1/");
!         writer.collectNamespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#");
!         writer.collectNamespace("http://www.w3.org/2000/01/rdf-schema#");
!         writer.collectNamespace("http://www.w3.org/2002/07/owl#");
!         writer.collectNamespace("http://fabl.net/vocabularies/geography/map/1.1/");
!         writer.collectNamespace("http://www.w3.org/2003/01/geo/wgs84_pos#");
!         writer.collectNamespace("http://purl.org/dc/elements/1.1/");
!         writer.collectNamespace("http://www.mediavirus.org/foo#");
!         writer.collectNamespace("http://www.w3.org/2003/06/sw-vocab-status/ns#");
!         writer.collectNamespace("http://xmlns.com/wot/0.1/");
  
          OutputStreamWriter owriter = new OutputStreamWriter(out);
--- 64,103 ----
          RDFWriter writer = new RDFWriter();
  
+         Map<String, String> namespaceMap = GraphlRegistry.instance().getVocabularyRegistry().getNamespaces();
+         for (Iterator prefixes = namespaceMap.keySet().iterator(); prefixes.hasNext();) {
+             String prefix = (String)prefixes.next();
+             writer.addNamespacePrefix(prefix, namespaceMap.get(prefix));            
+         }
          // TODO (2) use vocabularies from config for prefix resolution
! //        writer.addNamespacePrefix("graphl", NS.graphl);
! //        writer.addNamespacePrefix("foaf", "http://xmlns.com/foaf/0.1/");
! //        writer.addNamespacePrefix("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
! //        writer.addNamespacePrefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
! //        writer.addNamespacePrefix("owl", "http://www.w3.org/2002/07/owl#");
! //        writer.addNamespacePrefix("map", "http://fabl.net/vocabularies/geography/map/1.1/");
! //        writer.addNamespacePrefix("geo", "http://www.w3.org/2003/01/geo/wgs84_pos#");
! //        writer.addNamespacePrefix("dc", "http://purl.org/dc/elements/1.1/");
! //        writer.addNamespacePrefix("foo", "http://www.mediavirus.org/foo#");
! //        writer.addNamespacePrefix("vs", "http://www.w3.org/2003/06/sw-vocab-status/ns#");
! //        writer.addNamespacePrefix("wot", "http://xmlns.com/wot/0.1/");
  
          writer.prepareNamespaceCollection();
  
!         for (Iterator namespaces = namespaceMap.values().iterator(); namespaces.hasNext();) {
!             String ns = (String)namespaces.next();
!             writer.collectNamespace(ns);            
!         }
!         
! //        writer.collectNamespace(NS.graphl);
! //        writer.collectNamespace("http://xmlns.com/foaf/0.1/");
! //        writer.collectNamespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#");
! //        writer.collectNamespace("http://www.w3.org/2000/01/rdf-schema#");
! //        writer.collectNamespace("http://www.w3.org/2002/07/owl#");
! //        writer.collectNamespace("http://fabl.net/vocabularies/geography/map/1.1/");
! //        writer.collectNamespace("http://www.w3.org/2003/01/geo/wgs84_pos#");
! //        writer.collectNamespace("http://purl.org/dc/elements/1.1/");
! //        writer.collectNamespace("http://www.mediavirus.org/foo#");
! //        writer.collectNamespace("http://www.w3.org/2003/06/sw-vocab-status/ns#");
! //        writer.collectNamespace("http://xmlns.com/wot/0.1/");
  
          OutputStreamWriter owriter = new OutputStreamWriter(out);
***************
*** 178,181 ****
--- 189,193 ----
                  edge.setSource(NS.graphl + "SYSTEM");
                  edge.setType(NS.graphl + "definedIn");
+                 addElements(null, Collections.singleton(edge));
              }
      
***************
*** 270,274 ****
                  edge.setType(predicate);
                  edge.setSource(loadingURL.toString());
!                 addElements(null, Collections.singleton(edge));
                  if (DEBUG) System.out.println("created edge " + subject + ", " + predicate + ", " + object);
  
--- 282,286 ----
                  edge.setType(predicate);
                  edge.setSource(loadingURL.toString());
!                 addElements(null, Collections.singleton((Edge)edge));
                  if (DEBUG) System.out.println("created edge " + subject + ", " + predicate + ", " + object);
  
***************
*** 309,313 ****
              node.setCenter(r * Math.sin(loadAlpha), r * Math.cos(loadAlpha));
              loadCount++;
!             addElements(Collections.singleton(node), null);
              if (DEBUG) System.out.println("created node " + uri);
          }
--- 321,325 ----
              node.setCenter(r * Math.sin(loadAlpha), r * Math.cos(loadAlpha));
              loadCount++;
!             addElements(Collections.singleton((Node)node), null);
              if (DEBUG) System.out.println("created node " + uri);
          }
***************
*** 325,328 ****
--- 337,341 ----
                  edge.setSource(NS.graphl + "SYSTEM");
                  edge.setType(NS.graphl + "definedIn");
+                 addElements(null, Collections.singleton(edge));
              }
          }
***************
*** 333,337 ****
  
          RDFNode node = new RDFNode(this);
!         addElements(Collections.singleton(node), null);
          return node;
      }
--- 346,350 ----
  
          RDFNode node = new RDFNode(this);
!         //addElements(Collections.singleton(node), null);
          return node;
      }
***************
*** 346,350 ****
              edge.setSource(NS.graphl + "USER");
          }
!         addElements(null, Collections.singleton(edge));
          return edge;
      }
--- 359,363 ----
              edge.setSource(NS.graphl + "USER");
          }
!         //addElements(null, Collections.singleton(edge));
          return edge;
      }
***************
*** 381,385 ****
      public void logicalURI(String logicalURI) throws SAXException {
  
!         if (DEBUG) System.out.println("RDF: logicalURI: " + logicalURI);
      }
  
--- 394,399 ----
      public void logicalURI(String logicalURI) throws SAXException {
  
!         if (DEBUG)
!             System.out.println("RDF: logicalURI: " + logicalURI);
      }
  
***************
*** 389,393 ****
      public void includeModel(String logicalURI, String physicalURI) throws SAXException {
  
!         if (DEBUG) System.out.println("RDF: includeModel: " + logicalURI + ", " + physicalURI);
      }
  
--- 403,408 ----
      public void includeModel(String logicalURI, String physicalURI) throws SAXException {
  
!         if (DEBUG)
!             System.out.println("RDF: includeModel: " + logicalURI + ", " + physicalURI);
      }
  
***************
*** 397,401 ****
      public void addModelAttribte(String key, String value) throws SAXException {
  
!         if (DEBUG) System.out.println("RDF: addModelAttribte" + key + ", " + value);
      }
  
--- 412,417 ----
      public void addModelAttribte(String key, String value) throws SAXException {
  
!         if (DEBUG)
!             System.out.println("RDF: addModelAttribte" + key + ", " + value);
      }
  
***************
*** 429,433 ****
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#addElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void addElements(Collection nodes, Collection edges) {
  
          setDirty();
--- 445,449 ----
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#addElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void addElements(Collection<Node> nodes, Collection<Edge> edges) {
  
          setDirty();
***************
*** 435,439 ****
  
          if (nodes != null) {
!             for (Iterator iter = nodes.iterator(); iter.hasNext();) {
                  RDFNode node = (RDFNode) iter.next();
                  allNodes.put(node.getId(), node);
--- 451,455 ----
  
          if (nodes != null) {
!             for (Iterator<Node> iter = nodes.iterator(); iter.hasNext();) {
                  RDFNode node = (RDFNode) iter.next();
                  allNodes.put(node.getId(), node);
***************
*** 456,460 ****
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#deleteElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void deleteElements(Collection nodes, Collection edges) {
  
          setDirty();
--- 472,476 ----
       * Overrides @see de.fzi.wim.guibase.graphview.graph.DefaultGraph#deleteElements(java.util.Collection, java.util.Collection)
       */
!     public synchronized void deleteElements(Collection<Node> nodes, Collection<Edge> edges) {
  
          setDirty();

[graphl-cvs] graphl/src/org/mediavirus/graphl/selection DefaultSelectionModel.java SelectionListener.java SelectionModel.java

From: Flo L. <fl...@us...> - 2005-12-18 11:11:53

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/selection

Modified Files:
	DefaultSelectionModel.java SelectionListener.java 
	SelectionModel.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: SelectionListener.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/SelectionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SelectionListener.java	23 Jun 2004 09:18:57 -0000	1.1
--- SelectionListener.java	18 Dec 2005 11:11:41 -0000	1.2
***************
*** 5,8 ****
--- 5,11 ----
  import java.util.EventListener;
  
+ import org.mediavirus.graphl.graph.Edge;
+ import org.mediavirus.graphl.graph.Node;
+ 
  /**
   * A listener for node selection.
***************
*** 15,19 ****
       * @param nodes                                 the nodes added to the selection
       */
!     void nodesAddedToSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when nodes are removed to the selection.
--- 18,22 ----
       * @param nodes                                 the nodes added to the selection
       */
!     void nodesAddedToSelection(SelectionModel nodeSelectionModel,Collection<Node> nodes);
      /**
       * Called when nodes are removed to the selection.
***************
*** 22,26 ****
       * @param nodes                                 the nodes removed to the selection
       */
!     void nodesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when nodes are added to the selection.
--- 25,29 ----
       * @param nodes                                 the nodes removed to the selection
       */
!     void nodesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection<Node> nodes);
      /**
       * Called when nodes are added to the selection.
***************
*** 29,33 ****
       * @param nodes                                 the nodes added to the selection
       */
!     void edgesAddedToSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when nodes are removed to the selection.
--- 32,36 ----
       * @param nodes                                 the nodes added to the selection
       */
!     void edgesAddedToSelection(SelectionModel nodeSelectionModel,Collection<Edge> edges);
      /**
       * Called when nodes are removed to the selection.
***************
*** 36,40 ****
       * @param nodes                                 the nodes removed to the selection
       */
!     void edgesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection nodes);
      /**
       * Called when the selection is cleared.
--- 39,43 ----
       * @param nodes                                 the nodes removed to the selection
       */
!     void edgesRemovedFromSelection(SelectionModel nodeSelectionModel,Collection<Edge> edges);
      /**
       * Called when the selection is cleared.

Index: DefaultSelectionModel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/DefaultSelectionModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DefaultSelectionModel.java	23 Jun 2004 09:18:57 -0000	1.1
--- DefaultSelectionModel.java	18 Dec 2005 11:11:41 -0000	1.2
***************
*** 21,27 ****
      protected EventListenerList eventListenerList;
      /** The set of selected nodes. */
!     protected Set selectedNodes;
      /** The set of selected nodes. */
!     protected Set selectedEdges;
      /** The graph being managed by this model. */
      protected Graph graph;
--- 21,27 ----
      protected EventListenerList eventListenerList;
      /** The set of selected nodes. */
!     protected Set<Node> selectedNodes;
      /** The set of selected nodes. */
!     protected Set<Edge> selectedEdges;
      /** The graph being managed by this model. */
      protected Graph graph;
***************
*** 35,40 ****
          this.graph = graph;
          eventListenerList = new EventListenerList();
!         selectedNodes = new HashSet();
!         selectedEdges = new HashSet();
          graph.addGraphListener(new GraphHandler());
      }
--- 35,40 ----
          this.graph = graph;
          eventListenerList = new EventListenerList();
!         selectedNodes = new HashSet<Node>();
!         selectedEdges = new HashSet<Edge>();
          graph.addGraphListener(new GraphHandler());
      }
***************
*** 45,49 ****
       */
      public void addNode(Node node) {
!         Set addedNode=new HashSet();
          addedNode.add(node);
          addNodes(addedNode);
--- 45,49 ----
       */
      public void addNode(Node node) {
!         Set<Node> addedNode=new HashSet<Node>();
          addedNode.add(node);
          addNodes(addedNode);
***************
*** 54,58 ****
       * @param nodes                         the collection of nodes to add to the selection
       */
!     public void addNodes(Collection nodes) {
          if (selectedNodes.addAll(nodes))
              fireNodesAddedToSelection(nodes);
--- 54,58 ----
       * @param nodes                         the collection of nodes to add to the selection
       */
!     public void addNodes(Collection<Node> nodes) {
          if (selectedNodes.addAll(nodes))
              fireNodesAddedToSelection(nodes);
***************
*** 64,71 ****
       */
      public void removeNode(Node node) {
!         Set removedNode=new HashSet();
          removedNode.add(node);
          removeNodes(removedNode);
!         System.out.println("removing node");
      }
      /**
--- 64,71 ----
       */
      public void removeNode(Node node) {
!         Set<Node> removedNode=new HashSet<Node>();
          removedNode.add(node);
          removeNodes(removedNode);
!         //System.out.println("removing node");
      }
      /**
***************
*** 74,78 ****
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     public void removeNodes(Collection nodes) {
          if (selectedNodes.removeAll(nodes))
              fireNodesRemovedFromSelection(nodes);
--- 74,78 ----
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     public void removeNodes(Collection<Node> nodes) {
          if (selectedNodes.removeAll(nodes))
              fireNodesRemovedFromSelection(nodes);
***************
*** 98,102 ****
       */
      public void addEdge(Edge edge) {
!         Set addedEdge=new HashSet();
          addedEdge.add(edge);
          addEdges(addedEdge);
--- 98,102 ----
       */
      public void addEdge(Edge edge) {
!         Set<Edge> addedEdge=new HashSet<Edge>();
          addedEdge.add(edge);
          addEdges(addedEdge);
***************
*** 105,109 ****
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#addEdges(java.util.Collection)
       */
!     public void addEdges(Collection edges) {
          if (selectedEdges.addAll(edges))
              fireEdgesAddedToSelection(edges);
--- 105,109 ----
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#addEdges(java.util.Collection)
       */
!     public void addEdges(Collection<Edge> edges) {
          if (selectedEdges.addAll(edges))
              fireEdgesAddedToSelection(edges);
***************
*** 113,117 ****
       */
      public void removeEdge(Edge edge) {
!         Set removedEdge=new HashSet();
          removedEdge.add(edge);
          removeEdges(removedEdge);
--- 113,117 ----
       */
      public void removeEdge(Edge edge) {
!         Set<Edge> removedEdge=new HashSet<Edge>();
          removedEdge.add(edge);
          removeEdges(removedEdge);
***************
*** 120,124 ****
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#removeEdges(java.util.Collection)
       */
!     public void removeEdges(Collection edges) {
          if (selectedEdges.removeAll(edges))
              fireEdgesRemovedFromSelection(edges);
--- 120,124 ----
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#removeEdges(java.util.Collection)
       */
!     public void removeEdges(Collection<Edge> edges) {
          if (selectedEdges.removeAll(edges))
              fireEdgesRemovedFromSelection(edges);
***************
*** 129,133 ****
       * @return                              the selection
       */
!     public Collection getSelectedNodes() {
          return Collections.unmodifiableCollection(selectedNodes);
      }
--- 129,133 ----
       * @return                              the selection
       */
!     public Collection<Node> getSelectedNodes() {
          return Collections.unmodifiableCollection(selectedNodes);
      }
***************
*** 144,148 ****
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#getSelectedEdges()
       */
!     public Collection getSelectedEdges() {
          return Collections.unmodifiableCollection(selectedEdges);
      }
--- 144,148 ----
       * Overrides @see org.mediavirus.graphl.selection.SelectionModel#getSelectedEdges()
       */
!     public Collection<Edge> getSelectedEdges() {
          return Collections.unmodifiableCollection(selectedEdges);
      }
***************
*** 174,178 ****
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireNodesAddedToSelection(Collection nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 174,178 ----
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireNodesAddedToSelection(Collection<Node> nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 184,188 ****
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireNodesRemovedFromSelection(Collection nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 184,188 ----
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireNodesRemovedFromSelection(Collection<Node> nodes) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 194,198 ****
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireEdgesAddedToSelection(Collection edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 194,198 ----
       * @param nodes                         the collection of nodes added to the selection
       */
!     protected void fireEdgesAddedToSelection(Collection<Edge> edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 204,208 ****
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireEdgesRemovedFromSelection(Collection edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
--- 204,208 ----
       * @param nodes                         the collection of nodes removed from the selection
       */
!     protected void fireEdgesRemovedFromSelection(Collection<Edge> edges) {
          EventListener[] listeners=eventListenerList.getListeners(SelectionListener.class);
          for (int i=0;i<listeners.length;i++)
***************
*** 233,237 ****
          public void elementsRemoved(Graph graph,Collection nodes,Collection edges) {
              if (nodes!=null) {
!                 Set toRemove=null;
                  Iterator iterator=nodes.iterator();
                  while (iterator.hasNext()) {
--- 233,237 ----
          public void elementsRemoved(Graph graph,Collection nodes,Collection edges) {
              if (nodes!=null) {
!                 Set<Node> toRemove=null;
                  Iterator iterator=nodes.iterator();
                  while (iterator.hasNext()) {
***************
*** 239,243 ****
                      if (selectedNodes.contains(node)) {
                          if (toRemove==null)
!                             toRemove=new HashSet();
                          toRemove.add(node);
                      }
--- 239,243 ----
                      if (selectedNodes.contains(node)) {
                          if (toRemove==null)
!                             toRemove=new HashSet<Node>();
                          toRemove.add(node);
                      }

Index: SelectionModel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/selection/SelectionModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SelectionModel.java	4 Oct 2004 10:21:06 -0000	1.2
--- SelectionModel.java	18 Dec 2005 11:11:41 -0000	1.3
***************
*** 23,27 ****
       * @param nodes                         the collection of nodes to add to the selection
       */
!     void addNodes(Collection nodes);
      /**
       * Removes a node from the selection.
--- 23,27 ----
       * @param nodes                         the collection of nodes to add to the selection
       */
!     void addNodes(Collection<Node> nodes);
      /**
       * Removes a node from the selection.
***************
*** 35,39 ****
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     void removeNodes(Collection nodes);
      /**
       * Adds an edge to the selection.
--- 35,39 ----
       * @param nodes                         the collection of nodes to remove from the selection
       */
!     void removeNodes(Collection<Node> nodes);
      /**
       * Adds an edge to the selection.
***************
*** 47,51 ****
       * @param edges                         the collection of edges to add to the selection
       */
!     void addEdges(Collection edges);
      /**
       * Removes an edge from the selection.
--- 47,51 ----
       * @param edges                         the collection of edges to add to the selection
       */
!     void addEdges(Collection<Edge> edges);
      /**
       * Removes an edge from the selection.
***************
*** 59,63 ****
       * @param edges                         the collection of edges to remove from the selection
       */
!     void removeEdges(Collection edges);
      /**
       * Clears the selection.
--- 59,63 ----
       * @param edges                         the collection of edges to remove from the selection
       */
!     void removeEdges(Collection<Edge> edges);
      /**
       * Clears the selection.
***************
*** 69,73 ****
       * @return                              the selection
       */
!     Collection getSelectedNodes();
      /**
       * Returns the selection.
--- 69,73 ----
       * @return                              the selection
       */
!     Collection<Node> getSelectedNodes();
      /**
       * Returns the selection.
***************
*** 75,79 ****
       * @return                              the selection
       */
!     Collection getSelectedEdges();
      /**
       * Checks whteher the node has been selected.
--- 75,79 ----
       * @return                              the selection
       */
!     Collection<Edge> getSelectedEdges();
      /**
       * Checks whteher the node has been selected.

[graphl-cvs] graphl/src/org/mediavirus/graphl GraphlRegistry.java GraphlApplication.java GraphlApplet.java GraphlPane.java GraphlPanel.java

From: Flo L. <fl...@us...> - 2005-12-18 11:11:53

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl

Modified Files:
	GraphlApplication.java GraphlApplet.java GraphlPane.java 
	GraphlPanel.java 
Added Files:
	GraphlRegistry.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: GraphlPanel.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPanel.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** GraphlPanel.java	5 Sep 2005 15:46:38 -0000	1.24
--- GraphlPanel.java	18 Dec 2005 11:11:40 -0000	1.25
***************
*** 280,287 ****
  		if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE || e.getKeyCode() == KeyEvent.VK_DELETE) {
  		    
! 		    Iterator nodes = graphPane.getSelection().getSelectedNodes().iterator();
  		    while (nodes.hasNext()) {
!                 Node node = (Node) nodes.next();
! 				Vector edges = new Vector();
  				edges.addAll(node.getEdgesFrom());
  				edges.addAll(node.getEdgesTo());
--- 280,287 ----
  		if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE || e.getKeyCode() == KeyEvent.VK_DELETE) {
  		    
! 		    Iterator<Node> nodes = graphPane.getSelection().getSelectedNodes().iterator();
  		    while (nodes.hasNext()) {
!                 Node node = nodes.next();
! 				Vector<Edge> edges = new Vector<Edge>();
  				edges.addAll(node.getEdgesFrom());
  				edges.addAll(node.getEdgesTo());
***************
*** 298,305 ****
  	}
  
! 	public void nodesAddedToSelection(SelectionModel nodeSelectionModel, Collection nodes) {
  	}
  
! 	public void nodesRemovedFromSelection(SelectionModel nodeSelectionModel, Collection nodes) {
  	}
  
--- 298,305 ----
  	}
  
! 	public void nodesAddedToSelection(SelectionModel nodeSelectionModel, Collection<Node> nodes) {
  	}
  
! 	public void nodesRemovedFromSelection(SelectionModel nodeSelectionModel, Collection<Node> nodes) {
  	}
  
***************
*** 310,314 ****
       * @see org.mediavirus.graphl.selection.SelectionListener#edgesAddedToSelection(org.mediavirus.graphl.selection.SelectionModel, java.util.Collection)
       */
!     public void edgesAddedToSelection(SelectionModel nodeSelectionModel, Collection nodes) {
      }
  
--- 310,314 ----
       * @see org.mediavirus.graphl.selection.SelectionListener#edgesAddedToSelection(org.mediavirus.graphl.selection.SelectionModel, java.util.Collection)
       */
!     public void edgesAddedToSelection(SelectionModel nodeSelectionModel, Collection<Edge> edges) {
      }
  
***************
*** 316,320 ****
       * @see org.mediavirus.graphl.selection.SelectionListener#edgesRemovedFromSelection(org.mediavirus.graphl.selection.SelectionModel, java.util.Collection)
       */
!     public void edgesRemovedFromSelection(SelectionModel nodeSelectionModel, Collection nodes) {
      }
  
--- 316,320 ----
       * @see org.mediavirus.graphl.selection.SelectionListener#edgesRemovedFromSelection(org.mediavirus.graphl.selection.SelectionModel, java.util.Collection)
       */
!     public void edgesRemovedFromSelection(SelectionModel nodeSelectionModel, Collection<Edge> edges) {
      }
  

--- NEW FILE: GraphlRegistry.java ---
/*
 * Created on 17.12.2005
 */

package org.mediavirus.graphl;

import java.util.HashMap;

import org.mediavirus.graphl.vocabulary.SimpleVocabularyRegistry;
import org.mediavirus.graphl.vocabulary.VocabularyRegistry;


public class GraphlRegistry extends HashMap<String, Object>{

    protected static GraphlRegistry instance;
    
    VocabularyRegistry vocabularyRegistry;
    
    protected GraphlRegistry(){}
    
    public static synchronized GraphlRegistry instance() {
        if (instance == null) {
            instance = new GraphlRegistry();
        }
        return instance;
    }
    
    public synchronized VocabularyRegistry getVocabularyRegistry() {
        if (vocabularyRegistry == null) {
            vocabularyRegistry = new SimpleVocabularyRegistry();
        }
        return vocabularyRegistry;
    }
    
    public void setVocabularyRegistry(VocabularyRegistry vocabularyRegistry) {
        this.vocabularyRegistry = vocabularyRegistry;
    }
    
    
}

Index: GraphlApplet.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GraphlApplet.java	14 Dec 2005 12:43:51 -0000	1.12
--- GraphlApplet.java	18 Dec 2005 11:11:40 -0000	1.13
***************
*** 117,121 ****
          	try {
          		// if it is an absolute url, redirect through proxy servlet
!         		URL testurl = new URL(urlstr);
          		urlstr = "proxy?url=" + urlstr;        		
          	}
--- 117,121 ----
          	try {
          		// if it is an absolute url, redirect through proxy servlet
!         		@SuppressWarnings("unused") URL testurl = new URL(urlstr);
          		urlstr = "proxy?url=" + urlstr;        		
          	}
***************
*** 153,157 ****
          	try {
          		// if it is an absolute url, redirect through proxy servlet
!         		URL testurl = new URL(urlstr);
          		urlstr = "proxy?url=" + urlstr;
          	}
--- 153,157 ----
          	try {
          		// if it is an absolute url, redirect through proxy servlet
!         		@SuppressWarnings("unused") URL testurl = new URL(urlstr);
          		urlstr = "proxy?url=" + urlstr;
          	}

Index: GraphlApplication.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlApplication.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** GraphlApplication.java	14 Dec 2005 12:43:51 -0000	1.22
--- GraphlApplication.java	18 Dec 2005 11:11:40 -0000	1.23
***************
*** 32,35 ****
--- 32,36 ----
  import javax.swing.KeyStroke;
  
+ import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
  import org.mediavirus.graphl.graph.Graph;
  import org.mediavirus.graphl.graph.Node;
***************
*** 39,42 ****
--- 40,44 ----
  import org.mediavirus.graphl.gui.GenericDialog;
  import org.mediavirus.graphl.gui.OpenURLPanel;
+ import org.mediavirus.graphl.jxpath.GraphPointerFactory;
  import org.mediavirus.graphl.painter.NodePainter;
  import org.mediavirus.graphl.vocabulary.DC;
***************
*** 191,199 ****
  		
  		// TODO (Future) the whole vocab. registration should be defined in RDF files
! 		mainPanel.graphPane.getVocabularyRegistry().registerVocabulary(Graphl.getVocabulary());
! 		mainPanel.graphPane.getVocabularyRegistry().registerVocabulary(RDF.getVocabulary());
! 		mainPanel.graphPane.getVocabularyRegistry().registerVocabulary(RDFS.getVocabulary());
! 		mainPanel.graphPane.getVocabularyRegistry().registerVocabulary(DC.getVocabulary());
! 		mainPanel.graphPane.getVocabularyRegistry().registerVocabulary(FOAF.getVocabulary());
  		
      }
--- 193,203 ----
  		
  		// TODO (Future) the whole vocab. registration should be defined in RDF files
! 		GraphlRegistry.instance().getVocabularyRegistry().registerVocabulary(Graphl.getVocabulary());
!         GraphlRegistry.instance().getVocabularyRegistry().registerVocabulary(RDF.getVocabulary());
!         GraphlRegistry.instance().getVocabularyRegistry().registerVocabulary(RDFS.getVocabulary());
!         GraphlRegistry.instance().getVocabularyRegistry().registerVocabulary(DC.getVocabulary());
!         GraphlRegistry.instance().getVocabularyRegistry().registerVocabulary(FOAF.getVocabulary());
!         
!         GraphlRegistry.instance().getVocabularyRegistry().registerNamespace("ff", "http://www.funkfeuer.at/vocab#");
  		
      }
***************
*** 568,571 ****
--- 572,577 ----
      	System.setProperty("swing.metalTheme", "steel");
          
+         JXPathContextReferenceImpl.addNodePointerFactory(new GraphPointerFactory());
+         
  		GraphlApplication app = new GraphlApplication();
  		int[] size = {1024, 768};
***************
*** 658,662 ****
  			long starttime = 0;
  			
! 			List persons = new ArrayList(200);
  			
  			public void run() {
--- 664,668 ----
  			long starttime = 0;
  			
! 			List<Node> persons = new ArrayList<Node>(200);
  			
  			public void run() {

Index: GraphlPane.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/GraphlPane.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** GraphlPane.java	14 Dec 2005 12:43:51 -0000	1.22
--- GraphlPane.java	18 Dec 2005 11:11:40 -0000	1.23
***************
*** 49,54 ****
  import org.mediavirus.graphl.view.SimpleFacetRegistry;
  import org.mediavirus.graphl.vocabulary.NS;
- import org.mediavirus.graphl.vocabulary.SimpleVocabularyRegistry;
- import org.mediavirus.graphl.vocabulary.VocabularyRegistry;
  
  /**
--- 49,52 ----
***************
*** 58,63 ****
  public class GraphlPane extends JPanel implements GraphListener {
  	
!     private Set registeredEdgeTypes = new HashSet();
!     private Set registeredNodeTypes = new HashSet();
      
      private boolean autoRegisterTypes = true;
--- 56,61 ----
  public class GraphlPane extends JPanel implements GraphListener {
  	
!     private Set<String> registeredEdgeTypes = new HashSet<String>();
!     private Set<String> registeredNodeTypes = new HashSet<String>();
      
      private boolean autoRegisterTypes = true;
***************
*** 74,78 ****
      
      FacetRegistry facetRegistry = new SimpleFacetRegistry();
-     VocabularyRegistry vocabularyRegistry = new SimpleVocabularyRegistry();
  
      /** The graph being visualized. */
--- 72,75 ----
***************
*** 81,85 ****
      protected GraphListener graphListener;
      /** The array of registered manipulators in the order they were registered. */
!     protected List manipulators;
  
      protected SelectionModel selection;
--- 78,82 ----
      protected GraphListener graphListener;
      /** The array of registered manipulators in the order they were registered. */
!     protected List<Manipulator> manipulators;
  
      protected SelectionModel selection;
***************
*** 102,106 ****
          setSourceGraph(graph);
          graphListener=new GraphHandler();
!         manipulators=new ArrayList();
          enableEvents(MouseEvent.MOUSE_EVENT_MASK | MouseEvent.MOUSE_MOTION_EVENT_MASK | KeyEvent.KEY_EVENT_MASK | FocusEvent.FOCUS_EVENT_MASK | ComponentEvent.COMPONENT_EVENT_MASK);
          setBackground(Color.white);
--- 99,103 ----
          setSourceGraph(graph);
          graphListener=new GraphHandler();
!         manipulators=new ArrayList<Manipulator>();
          enableEvents(MouseEvent.MOUSE_EVENT_MASK | MouseEvent.MOUSE_MOTION_EVENT_MASK | KeyEvent.KEY_EVENT_MASK | FocusEvent.FOCUS_EVENT_MASK | ComponentEvent.COMPONENT_EVENT_MASK);
          setBackground(Color.white);
***************
*** 141,158 ****
  		this.comment = comment;
  	}
- 
- 	/**
- 	 * @return The VocabularyRegistry.
- 	 */
- 	public VocabularyRegistry getVocabularyRegistry() {
- 		return vocabularyRegistry;
- 	}
- 	
- 	/**
- 	 * @param vocabularyRegistry The VocabularyRegistry to set.
- 	 */
- 	public void setVocabularyRegistry(VocabularyRegistry vocabularyRegistry) {
- 		this.vocabularyRegistry = vocabularyRegistry;
- 	}
  	
  	Node vocabularies = null;
--- 138,141 ----
***************
*** 206,210 ****
  		    g2.transform(transform);
  		}
!         long renderStartTime=System.currentTimeMillis();
          Rectangle clipRectangle=g.getClipBounds();
          Color oldColor=g.getColor();
--- 189,193 ----
  		    g2.transform(transform);
  		}
!         //long renderStartTime=System.currentTimeMillis();
          Rectangle clipRectangle=g.getClipBounds();
          Color oldColor=g.getColor();
***************
*** 260,264 ****
                  for (int i=0;i<manipulators.size();i++)
                      ((Manipulator)manipulators.get(i)).paint(g2);
!                 long renderDuration = System.currentTimeMillis()-renderStartTime;
                  //if (renderDuration > 0) System.out.println("render time: " + renderDuration + " FPS: " + 1000.0/renderDuration);
              }
--- 243,247 ----
                  for (int i=0;i<manipulators.size();i++)
                      ((Manipulator)manipulators.get(i)).paint(g2);
!                 //long renderDuration = System.currentTimeMillis()-renderStartTime;
                  //if (renderDuration > 0) System.out.println("render time: " + renderDuration + " FPS: " + 1000.0/renderDuration);
              }
***************
*** 475,479 ****
      public Set getNodesInRectangle(Rectangle rectangle) {
          synchronized (filteredGraph) {
!             Set nodesInRectangle=new HashSet();
              Rectangle nodeRectangle=new Rectangle();
              Iterator nodes=filteredGraph.getNodes().iterator();
--- 458,462 ----
      public Set getNodesInRectangle(Rectangle rectangle) {
          synchronized (filteredGraph) {
!             Set<Node> nodesInRectangle=new HashSet<Node>();
              Rectangle nodeRectangle=new Rectangle();
              Iterator nodes=filteredGraph.getNodes().iterator();
***************
*** 801,805 ****
      
      /** A List with all configuration nodes in the settings graph */
!     private List configurations = new ArrayList();
      
      private Node currentConfiguration = null;
--- 784,788 ----
      
      /** A List with all configuration nodes in the settings graph */
!     private List<Node> configurations = new ArrayList<Node>();
      
      private Node currentConfiguration = null;

[graphl-cvs] graphl/src/org/mediavirus/graphl/interaction DefaultNodeManipulator.java GraphlManipulator.java

From: Flo L. <fl...@us...> - 2005-12-18 11:11:53

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/interaction

Modified Files:
	DefaultNodeManipulator.java GraphlManipulator.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: GraphlManipulator.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction/GraphlManipulator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GraphlManipulator.java	7 Sep 2005 12:29:56 -0000	1.13
--- GraphlManipulator.java	18 Dec 2005 11:11:41 -0000	1.14
***************
*** 16,20 ****
  import org.mediavirus.graphl.GraphlPane;
  import org.mediavirus.graphl.graph.*;
- import org.mediavirus.graphl.graph.rdf.RDFEdge;
  import org.mediavirus.graphl.graph.rdf.RDFNode;
  import org.mediavirus.graphl.gui.EdgeContextMenu;
--- 16,19 ----
***************
*** 43,54 ****
      protected Cursor graphCursor;
  
-     private long lastClick;
  	private Point mousePos;
  	
  	private Node edgeNode = null;
! 	private Edge dragEdge = null;
  	private Node dragNode = null;
  	
- 	private double oldLength = 2;
  	Point dragStart = null;
  	
--- 42,51 ----
      protected Cursor graphCursor;
  
  	private Point mousePos;
  	
  	private Node edgeNode = null;
! 	//private Edge dragEdge = null;
  	private Node dragNode = null;
  	
  	Point dragStart = null;
  	
***************
*** 187,192 ****
  		    }
  		}
- 
- 		lastClick = e.getWhen();
  	}
  
--- 184,187 ----
***************
*** 227,233 ****
  			if (overNode!=null && overNode!=edgeNode) {
  				// we also allow multiple edges between two nodes!
! 				// TODO (2) Edge, Node constructors should be package protected and accessed only via facotry methods in Graph
! 				final RDFEdge edge = new RDFEdge(edgeNode, overNode);
! 				edge.setSource(NS.graphl + "USER");
  
  				TypeMenu edgeTypeMenu = new TypeMenu("New Edge", graphPane.getVocabularies());
--- 222,226 ----
  			if (overNode!=null && overNode!=edgeNode) {
  				// we also allow multiple edges between two nodes!
! 				final Edge edge = graphPane.getFilteredGraph().createEdge(edgeNode, overNode);
  
  				TypeMenu edgeTypeMenu = new TypeMenu("New Edge", graphPane.getVocabularies());
***************
*** 251,256 ****
  				Point d = new Point();
  			    graphPane.screenToGraphPoint(dragStart,d);
- 			    // TODO (3) length should be mapped to arbitrary property!
- 				//((DefaultEdge)edge).setLength(dragStart.distance(d));
  				((DefaultGraph)graphPane.getSourceGraph()).addElements(Collections.singleton(newNode), Collections.singleton(edge)); 
  				
--- 244,247 ----
***************
*** 272,276 ****
  		}
  
!         dragEdge = null;
  		dragNode = null;
  		edgeNode = null;
--- 263,267 ----
  		}
  
!         //dragEdge = null;
  		dragNode = null;
  		edgeNode = null;
***************
*** 292,306 ****
  			//graphPane.repaint();
          }
- //		else if (dragEdge != null) {
- //			int delta = (int)(mousePos.getY() - dragStart.getY());
- //			// TODO (2) setLength is not in Edge interface! -> Edge Manipulators
- //			if (oldLength-delta > 2)
- //				((DefaultEdge)dragEdge).setLength(oldLength-delta);
- //			else
- //				((DefaultEdge)dragEdge).setLength(2);
- //			graphPane.repaint();
- //			e.consume();
- //			graphPane.getGraph().notifyLayoutUpdated();
- //		}
  		else if (edgeNode != null) {
  			graphPane.repaint();
--- 283,286 ----

Index: DefaultNodeManipulator.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/interaction/DefaultNodeManipulator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultNodeManipulator.java	5 Sep 2005 15:46:38 -0000	1.2
--- DefaultNodeManipulator.java	18 Dec 2005 11:11:41 -0000	1.3
***************
*** 23,27 ****
  public class DefaultNodeManipulator extends AbstractManipulator implements NodeManipulator {
  
! 	private List assignedElements = new ArrayList();
  	
  	private Node overNode = null;
--- 23,27 ----
  public class DefaultNodeManipulator extends AbstractManipulator implements NodeManipulator {
  
! 	private List<GraphElement> assignedElements = new ArrayList<GraphElement>();
  	
  	private Node overNode = null;
***************
*** 113,117 ****
  		// need to return copy, becuase elements might be unassigned by caller
  		// this triggers a ConcurrentModificationException if original set is returned
! 		return new ArrayList(assignedElements);
  	}
  
--- 113,117 ----
  		// need to return copy, becuase elements might be unassigned by caller
  		// this triggers a ConcurrentModificationException if original set is returned
! 		return new ArrayList<GraphElement>(assignedElements);
  	}

[graphl-cvs] graphl/src/org/mediavirus/graphl/layout SortedNodeLayouter.java DirectedEdgeLayouter.java SpringEdgeLayouter.java GraphlLayoutStrategy.java

From: Flo L. <fl...@us...> - 2005-12-18 11:11:53

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618/src/org/mediavirus/graphl/layout

Modified Files:
	SortedNodeLayouter.java DirectedEdgeLayouter.java 
	SpringEdgeLayouter.java GraphlLayoutStrategy.java 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: GraphlLayoutStrategy.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/GraphlLayoutStrategy.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GraphlLayoutStrategy.java	24 Aug 2005 16:05:54 -0000	1.12
--- GraphlLayoutStrategy.java	18 Dec 2005 11:11:40 -0000	1.13
***************
*** 89,93 ****
       */
      public void executeGraphLayoutStep() {
!         long layoutStartTime=System.currentTimeMillis();
          for (int i=0;i<10;i++) {
              layoutEdges();
--- 89,93 ----
       */
      public void executeGraphLayoutStep() {
!         //long layoutStartTime=System.currentTimeMillis();
          for (int i=0;i<10;i++) {
              layoutEdges();
***************
*** 95,99 ****
              damp();
          }
!         long layoutDuration = System.currentTimeMillis()-layoutStartTime;
          //if (layoutDuration > 0) System.out.println("layout time: " + layoutDuration + " FPS: " + 1000.0/layoutDuration);
      }
--- 95,99 ----
              damp();
          }
!         //long layoutDuration = System.currentTimeMillis()-layoutStartTime;
          //if (layoutDuration > 0) System.out.println("layout time: " + layoutDuration + " FPS: " + 1000.0/layoutDuration);
      }
***************
*** 296,300 ****
      protected class GraphManager extends ListOfNodes {
          /** The node movement objects indexed by the node. */
!         protected Map nodeMovements;
  
          /** The maximum motion value after the last move. Used to see when the graph is stabilizinh. */
--- 296,300 ----
      protected class GraphManager extends ListOfNodes {
          /** The node movement objects indexed by the node. */
!         protected Map<Node, NodeMovement> nodeMovements;
  
          /** The maximum motion value after the last move. Used to see when the graph is stabilizinh. */
***************
*** 302,306 ****
  
          public GraphManager() {
!             nodeMovements=new HashMap();
          }
          public SubGraph getFirstSubGraph() {
--- 302,306 ----
  
          public GraphManager() {
!             nodeMovements=new HashMap<Node, NodeMovement>();
          }
          public SubGraph getFirstSubGraph() {

Index: DirectedEdgeLayouter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/DirectedEdgeLayouter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectedEdgeLayouter.java	17 Aug 2005 15:52:49 -0000	1.2
--- DirectedEdgeLayouter.java	18 Dec 2005 11:11:40 -0000	1.3
***************
*** 26,33 ****
      float length = 100.0f;
  
-     public double getLength(Edge edge) {
-         return edge.getLength();
-     }
- 
      public void performLayoutStep(Edge edge, GraphManager manager) {
          Node from=edge.getFrom();
--- 26,29 ----
***************
*** 100,124 ****
          this.direction = direction;
      }
- 
-     /**
-      * @return Returns the length.
-      */
-     public float getLength() {
-         return length;
-     }
-     /**
-      * @param length The length to set.
-      */
-     public void setLength(float length) {
-         this.length = length;
-     }
      
  	public void setConfigurationNode(Node node) {
  		
! 	    String str = node.getProperty(NS.graphl + "length");
! 	    if (str != null) {
! 			setLength(Float.parseFloat(str));
! 		}
! 		str = node.getProperty(NS.graphl + "direction");
  		if ( str != null) {
  			if (str.equalsIgnoreCase("up")) {
--- 96,103 ----
          this.direction = direction;
      }
      
  	public void setConfigurationNode(Node node) {
  		
!         String str = node.getProperty(NS.graphl + "direction");
  		if ( str != null) {
  			if (str.equalsIgnoreCase("up")) {

Index: SpringEdgeLayouter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/SpringEdgeLayouter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SpringEdgeLayouter.java	17 Aug 2005 15:52:49 -0000	1.9
--- SpringEdgeLayouter.java	18 Dec 2005 11:11:40 -0000	1.10
***************
*** 2,8 ****
   * Created on 09.06.2004 by Flo Ledermann <led...@im...>
   */
!  
  package org.mediavirus.graphl.layout;
  
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
--- 2,12 ----
   * Created on 09.06.2004 by Flo Ledermann <led...@im...>
   */
! 
  package org.mediavirus.graphl.layout;
  
+ import java.util.HashMap;
+ import java.util.Map;
+ 
+ import org.apache.commons.jxpath.JXPathContext;
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.graph.Node;
***************
*** 11,15 ****
  import org.mediavirus.graphl.vocabulary.NS;
  
- 
  /**
   * @author Flo Ledermann <led...@im...>
--- 15,18 ----
***************
*** 19,66 ****
  
      float defaultLength = 40.0f;
!     String lengthProperty = null;
!     
!     float lengthFactor = 1.0f;
!     
!     /** The rigidity has the same effect as the damper, except that it is a constant. */
!     float rigidity = 1.0f;
  
!     /*
!      * Overrides @see org.mediavirus.graphl.layout.EdgeLayouter#getLength(org.mediavirus.graphl.RDFEdge)
!      */
!     public double getLength(Edge edge) {
!         return edge.getLength();
      }
  
      /*
       * Overrides @see org.mediavirus.graphl.layout.EdgeLayouter#relaxEdge(org.mediavirus.graphl.RDFEdge)
       */
      public void performLayoutStep(Edge edge, GraphManager manager) {
!         float length = defaultLength;
!         if (lengthProperty != null) {
!             String str = edge.getProperty(lengthProperty);
!             if (str != null) {
!                 try {
!                     length = Float.parseFloat(str);
                  }
!                 catch (NumberFormatException nfex) {
!                     // do nothing
                  }
              }
          }
!         Node from=edge.getFrom();
!         Node to=edge.getTo();
!         double deltaX=to.getCenterX()-from.getCenterX();
!         double deltaY=to.getCenterY()-from.getCenterY();
!         double currentLength=Math.sqrt(deltaX*deltaX+deltaY*deltaY);
!         double factor=rigidity*currentLength/(length*100.0f*lengthFactor);
!         double dx=deltaX*factor;
!         double dy=deltaY*factor;
          // Edges pull directly in proportion to the distance between the nodes. This is good,
          // because we want the edges to be stretchy.  The edges are ideal rubberbands.
          // They don't become springs when they are too short.  That only causes the graph to oscillate.
!         
!         manager.getNodeMovement(from).applyDelta(dx,dy);
!         manager.getNodeMovement(to).applyDelta(-dx,-dy);
      }
  
--- 22,97 ----
  
      float defaultLength = 40.0f;
!     float defaultRigidity = 1.0f;
  
!     String lengthExpr;
!     String rigidityExpr;
! 
!     //TODO (3) this should be moved to EdgeView!
!     class Spring {
! 
!         protected float length;
!         protected float rigidity;
! 
!         protected Spring(float length, float rigidity) {
! 
!             this.length = length;
!             this.rigidity = rigidity;
!         }
      }
  
+     protected Map<Edge, Spring> springCache = new HashMap<Edge, Spring>();
+ 
      /*
       * Overrides @see org.mediavirus.graphl.layout.EdgeLayouter#relaxEdge(org.mediavirus.graphl.RDFEdge)
       */
      public void performLayoutStep(Edge edge, GraphManager manager) {
! 
!         Spring spring = springCache.get(edge);
! 
!         if (spring == null) {
!             float length = defaultLength;
!             float rigidity = defaultRigidity;
! 
!             if (lengthExpr != null || rigidityExpr != null) {
!                 JXPathContext context = JXPathContext.newContext(edge);
!                 context.setLenient(true);
!                 if (lengthExpr != null) {
!                     Object lengthO = context.getValue(lengthExpr);
!                     try {
!                         length = ((Double) lengthO).floatValue();
!                     }
!                     catch (Exception ex) {
!                     }
                  }
! 
!                 if (rigidityExpr != null) {
!                     Object rigidityO = context.getValue(rigidityExpr);
!                     try {
!                         rigidity = ((Double) rigidityO).floatValue();
!                     }
!                     catch (Exception ex) {
!                     }
                  }
              }
+             
+             spring = new Spring(length, rigidity);
+             springCache.put(edge, spring);
+ 
          }
! 
!         Node from = edge.getFrom();
!         Node to = edge.getTo();
!         double deltaX = to.getCenterX() - from.getCenterX();
!         double deltaY = to.getCenterY() - from.getCenterY();
!         double currentLength = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
!         double factor = spring.rigidity * currentLength / (spring.length * 100.0f);
!         double dx = deltaX * factor;
!         double dy = deltaY * factor;
          // Edges pull directly in proportion to the distance between the nodes. This is good,
          // because we want the edges to be stretchy.  The edges are ideal rubberbands.
          // They don't become springs when they are too short.  That only causes the graph to oscillate.
! 
!         manager.getNodeMovement(from).applyDelta(dx, dy);
!         manager.getNodeMovement(to).applyDelta(-dx, -dy);
      }
  
***************
*** 73,77 ****
  
      public String toString() {
!     	return getName();
      }
  
--- 104,108 ----
  
      public String toString() {
!         return getName();
      }
  
***************
*** 83,86 ****
--- 114,147 ----
      }
  
+     
+     public float getDefaultRigidity() {
+         return defaultRigidity;
+     }
+ 
+     
+     public void setDefaultRigidity(float defaultRigidity) {
+         this.defaultRigidity = defaultRigidity;
+     }
+ 
+     
+     public String getLengthExpr() {
+         return lengthExpr;
+     }
+ 
+     
+     public void setLengthExpr(String lengthExpr) {
+         this.lengthExpr = lengthExpr;
+     }
+ 
+     
+     public String getRigidityExpr() {
+         return rigidityExpr;
+     }
+ 
+     
+     public void setRigidityExpr(String rigidityExpr) {
+         this.rigidityExpr = rigidityExpr;
+     }
+ 
      /*
       * Overrides @see org.mediavirus.graphl.Facet#isSameClass(java.lang.Object)
***************
*** 94,106 ****
       */
      public Object clone() {
          SpringEdgeLayouter l = new SpringEdgeLayouter();
          l.setDefaultLength(defaultLength);
!         l.setLengthFactor(lengthFactor);
!         l.setLengthProperty(lengthProperty);
!         l.setRigidity(rigidity);
          return l;
      }
-     
-     
  
      /**
--- 155,168 ----
       */
      public Object clone() {
+ 
          SpringEdgeLayouter l = new SpringEdgeLayouter();
+         
          l.setDefaultLength(defaultLength);
!         l.setDefaultRigidity(defaultRigidity);
!         l.setLengthExpr(lengthExpr);
!         l.setRigidityExpr(rigidityExpr);
!         
          return l;
      }
  
      /**
***************
*** 109,133 ****
  
      public void setConfigurationNode(Node node) {
! 	    String str = node.getProperty(NS.graphl + "lengthFactor");
! 	    if (str != null) {
! 			setLengthFactor(Float.parseFloat(str));
! 		}
! 		str = node.getProperty(NS.graphl + "lengthProperty");
! 		if ( str != null) {
! 			setLengthProperty(str);
! 		}
! 		str = node.getProperty(NS.graphl + "defaultLength");
! 	    if (str != null) {
! 			setDefaultLength(Float.parseFloat(str));
! 		}
! 		str = node.getProperty(NS.graphl + "rigidity");
! 	    if (str != null) {
! 			setRigidity(Float.parseFloat(str));
! 		}
! 	}
!     
! 	public String getName() {
! 		return "Spring";
! 	}
  
      /**
--- 171,193 ----
  
      public void setConfigurationNode(Node node) {
! 
!         lengthExpr = node.getProperty(NS.graphl + "length");
!         rigidityExpr = node.getProperty(NS.graphl + "rigidity");
! 
!         String str = node.getProperty(NS.graphl + "defaultLength");
!         if (str != null) {
!             setDefaultLength(Float.parseFloat(str));
!         }
!         
!         str = node.getProperty(NS.graphl + "defaultRigidity");
!         if (str != null) {
!             setDefaultRigidity(Float.parseFloat(str));
!         }
!         
!     }
! 
!     public String getName() {
!         return "Spring";
!     }
  
      /**
***************
*** 137,140 ****
--- 197,201 ----
          return defaultLength;
      }
+ 
      /**
       * @param defaultLength The defaultLength to set.
***************
*** 143,181 ****
          this.defaultLength = defaultLength;
      }
!     /**
!      * @return Returns the lengthFactor.
!      */
!     public float getLengthFactor() {
!         return lengthFactor;
!     }
!     /**
!      * @param lengthFactor The lengthFactor to set.
!      */
!     public void setLengthFactor(float lengthFactor) {
!         this.lengthFactor = lengthFactor;
!     }
!     /**
!      * @return Returns the lengthProperty.
!      */
!     public String getLengthProperty() {
!         return lengthProperty;
!     }
!     /**
!      * @param lengthProperty The lengthProperty to set.
!      */
!     public void setLengthProperty(String lengthProperty) {
!         this.lengthProperty = lengthProperty;
!     }
!     /**
!      * @return Returns the rigidity.
!      */
!     public float getRigidity() {
!         return rigidity;
!     }
!     /**
!      * @param rigidity The rigidity to set.
!      */
!     public void setRigidity(float rigidity) {
!         this.rigidity = rigidity;
!     }
  }
--- 204,207 ----
          this.defaultLength = defaultLength;
      }
! 
  }

Index: SortedNodeLayouter.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/layout/SortedNodeLayouter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SortedNodeLayouter.java	5 Sep 2005 15:47:59 -0000	1.9
--- SortedNodeLayouter.java	18 Dec 2005 11:11:40 -0000	1.10
***************
*** 64,67 ****
--- 64,68 ----
          
          int num = assignedElements.size();
+         
          int pos = Collections.binarySearch(assignedElements, node, comparator);
                 
***************
*** 340,344 ****
      }
      
!     public class SortedNodeLayouterComparator implements Comparator {
          
          private String property = null;
--- 341,346 ----
      }
      
!     // TODO this should be Comparator<Node>, generics have to be fixed in AbstractFacet etc.
!     public class SortedNodeLayouterComparator implements Comparator<GraphElement> {
          
          private String property = null;
***************
*** 363,378 ****
          }
          
!         public int compare(Object o1, Object o2) {
!             Node n1 = (Node)o1;
!             Node n2 = (Node)o2;
!             
  			if (property != null) {
! 			    String val1 = n1.getProperty(property, "").toLowerCase();
! 			    String val2 = n2.getProperty(property, "").toLowerCase();
  			    return val1.compareTo(val2);
  			}
  			else return 0;
          }
!         
      }
  }
--- 365,377 ----
          }
          
!         public int compare(GraphElement n1, GraphElement n2) {
  			if (property != null) {
! 			    String val1 = ((Node)n1).getProperty(property, "").toLowerCase();
! 			    String val2 = ((Node)n2).getProperty(property, "").toLowerCase();
  			    return val1.compareTo(val2);
  			}
  			else return 0;
          }
! 
      }
  }

[graphl-cvs] graphl build.xml .classpath changelog.txt

From: Flo L. <fl...@us...> - 2005-12-18 11:11:52

Update of /cvsroot/graphl/graphl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2618

Modified Files:
	build.xml .classpath changelog.txt 
Log Message:
- FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
- CODE: Remove LabelGenerator classes - this can now done with RXPath
- CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
- CODE: added a singleton GraphlRegistry, currently only holding the vocabularyRegistry instance


Index: changelog.txt
===================================================================
RCS file: /cvsroot/graphl/graphl/changelog.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** changelog.txt	14 Dec 2005 12:45:08 -0000	1.19
--- changelog.txt	18 Dec 2005 11:11:41 -0000	1.20
***************
*** 2,5 ****
--- 2,9 ----
  ==================
  
+ 2005-12-18, f/0:
+ - FEATURE: RXPath landed! you can assign properties of facets through XPath-like expressions based on the currently rendered node
+ - CODE: migrated to JDK 1.5, added class specifiers for all collections (generics)
+ 
  2005-12-14, f/0:
  - FEATURE: new command line flag to start "navigator" thread to zoom & pan in the graph

Index: build.xml
===================================================================
RCS file: /cvsroot/graphl/graphl/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build.xml	29 Dec 2004 14:31:26 -0000	1.7
--- build.xml	18 Dec 2005 11:11:41 -0000	1.8
***************
*** 58,62 ****
          	nodeprecatedlist="false"
          	nodeprecated="false"
!         	packagenames="org.mediavirus.graphl,org.mediavirus.graphl.interaction,org.mediavirus.graphl.painter,org.mediavirus.graphl.graph,org.mediavirus.graphl.server,org.mediavirus.util,org.mediavirus.graphl.gui,org.mediavirus.graphl.view,org.mediavirus.graphl.layout,org.mediavirus.graphl.selection,org.mediavirus.graphl.vocabulary,org.mediavirus.graphl.graph.rdf"
          	sourcepath="src"
          	classpath="lib/servlet-api.jar;lib/rdfapi.jar;bin"
--- 58,62 ----
          	nodeprecatedlist="false"
          	nodeprecated="false"
!         	packagenames="*"
          	sourcepath="src"
          	classpath="lib/servlet-api.jar;lib/rdfapi.jar;bin"

Index: .classpath
===================================================================
RCS file: /cvsroot/graphl/graphl/.classpath,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .classpath	4 Oct 2004 10:21:05 -0000	1.6
--- .classpath	18 Dec 2005 11:11:41 -0000	1.7
***************
*** 7,10 ****
--- 7,11 ----
  	<classpathentry sourcepath="C:/Programme/java/l2fprod-common-0.1-dev/src" kind="lib" path="lib/l2fprod-common-fontchooser.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JXPath"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>

Flat | Threaded

<< < 1 2 3 4 5 .. 13 > >> (Page 3 of 13)

2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (48)	Sep (6)	Oct (64)	Nov (12)	Dec (13)
2005	Jan (10)	Feb	Mar	Apr	May	Jun	Jul	Aug (34)	Sep (31)	Oct	Nov	Dec (25)
2006	Jan	Feb	Mar	Apr	May	Jun (43)	Jul (16)	Aug	Sep	Oct	Nov	Dec