Menu
▾
▴
tinytim-commits — tinyTiM commit messages
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(48) |
May
(21) |
Jun
(3) |
Jul
(10) |
Aug
(66) |
Sep
(11) |
Oct
(7) |
Nov
(73) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(3) |
Feb
(17) |
Mar
(19) |
Apr
(1) |
May
(4) |
Jun
|
Jul
(43) |
Aug
(18) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2010 |
Jan
(3) |
Feb
(7) |
Mar
(21) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(6) |
Aug
(6) |
Sep
(7) |
Oct
|
Nov
(1) |
Dec
|
| 2011 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <lh...@us...> - 2008-08-05 12:46:47
|
Revision: 94
http://tinytim.svn.sourceforge.net/tinytim/?rev=94&view=rev
Author: lheuer
Date: 2008-08-05 12:46:53 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
- Updated CHANGES.txt
Modified Paths:
--------------
tinytim/trunk/CHANGES.txt
Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt 2008-08-05 12:45:50 UTC (rev 93)
+++ tinytim/trunk/CHANGES.txt 2008-08-05 12:46:53 UTC (rev 94)
@@ -2,11 +2,12 @@
Changes Log
===========
-1.5.0 alpha3 (xx.07.2008)
+1.5.0 beta1 (08.08.2008)
-------------------------
Bugfixes:
---------
* Bug #1970502 (Locator impl does no reference unescaping)
+* Bug #2038853 (Subject locators are not removable)
1.5.0 alpha2 (05.05.2008)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-05 12:45:41
|
Revision: 93
http://tinytim.svn.sourceforge.net/tinytim/?rev=93&view=rev
Author: lheuer
Date: 2008-08-05 12:45:50 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
- Fixed bug "[ 2038853 ] Subject locators are not removable"
Modified Paths:
--------------
tinytim/trunk/src/main/java/org/tinytim/TopicImpl.java
Modified: tinytim/trunk/src/main/java/org/tinytim/TopicImpl.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/TopicImpl.java 2008-08-05 12:41:44 UTC (rev 92)
+++ tinytim/trunk/src/main/java/org/tinytim/TopicImpl.java 2008-08-05 12:45:50 UTC (rev 93)
@@ -118,7 +118,7 @@
return;
}
_fireEvent(Event.REMOVE_SLO, slo, null);
- _sids.remove(slo);
+ _slos.remove(slo);
}
/* (non-Javadoc)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-05 12:41:37
|
Revision: 92
http://tinytim.svn.sourceforge.net/tinytim/?rev=92&view=rev
Author: lheuer
Date: 2008-08-05 12:41:44 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
- Adapted TMAPI API change
Modified Paths:
--------------
tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java
Modified: tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java
===================================================================
--- tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-08-04 13:00:24 UTC (rev 91)
+++ tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-08-05 12:41:44 UTC (rev 92)
@@ -1143,6 +1143,7 @@
return _typeInstance;
}
+ public Set<Topic> getRoleTypes() { return null; }
public Set<Role> getRoles(Topic type) { return null; }
public void setReifier(Topic reifier) { }
public void addItemIdentifier(Locator itemIdentifier) { }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-04 13:00:18
|
Revision: 91
http://tinytim.svn.sourceforge.net/tinytim/?rev=91&view=rev
Author: lheuer
Date: 2008-08-04 13:00:24 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
tinytim-cxtm/trunk/CHANGES.txt
Modified: tinytim-cxtm/trunk/CHANGES.txt
===================================================================
--- tinytim-cxtm/trunk/CHANGES.txt 2008-08-04 12:36:01 UTC (rev 90)
+++ tinytim-cxtm/trunk/CHANGES.txt 2008-08-04 13:00:24 UTC (rev 91)
@@ -2,7 +2,7 @@
Changes Log
===========
-1.0.0 alpha3 (xx.xx.2008)
+1.0.0 alpha3 (08.08.2008)
-------------------------
* Fixed bug #1971341 (Item identifiers of roles are omitted)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-04 12:35:55
|
Revision: 90
http://tinytim.svn.sourceforge.net/tinytim/?rev=90&view=rev
Author: lheuer
Date: 2008-08-04 12:36:01 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
- Updated to tinyTiM 2.0 /TMAPI 2.0
Modified Paths:
--------------
tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java
Modified: tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java
===================================================================
--- tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-08-04 12:30:28 UTC (rev 89)
+++ tinytim-cxtm/branches/tinytim2/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-08-04 12:36:01 UTC (rev 90)
@@ -38,29 +38,24 @@
import java.util.Set;
import java.util.logging.Logger;
-import org.tinytim.DuplicateRemovalUtils;
-import org.tinytim.IConstruct;
-import org.tinytim.IDatatypeAwareConstruct;
-import org.tinytim.IReifiable;
-import org.tinytim.ITyped;
-import org.tinytim.TopicMapImpl;
-import org.tinytim.index.ITypeInstanceIndex;
+import org.tinytim.core.DuplicateRemovalUtils;
+import org.tinytim.core.TopicMapImpl;
import org.tinytim.voc.TMDM;
import org.tmapi.core.Association;
-import org.tmapi.core.AssociationRole;
-import org.tmapi.core.DuplicateSourceLocatorException;
+import org.tmapi.core.Construct;
+import org.tmapi.core.DatatypeAware;
import org.tmapi.core.Locator;
-import org.tmapi.core.MergeException;
-import org.tmapi.core.ModelConstraintException;
+import org.tmapi.core.Name;
import org.tmapi.core.Occurrence;
-import org.tmapi.core.ScopedObject;
-import org.tmapi.core.TMAPIException;
+import org.tmapi.core.Reifiable;
+import org.tmapi.core.Role;
+import org.tmapi.core.Scoped;
import org.tmapi.core.Topic;
import org.tmapi.core.TopicInUseException;
import org.tmapi.core.TopicMap;
-import org.tmapi.core.TopicMapObject;
-import org.tmapi.core.TopicName;
+import org.tmapi.core.Typed;
import org.tmapi.core.Variant;
+import org.tmapi.index.TypeInstanceIndex;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
@@ -84,10 +79,7 @@
* </p>
* <p>
* The canonicalizer IS NOT a generic TMAPI-compatible implementation. It
- * requires tinyTiM. The canonicalizer requires that the property
- * {@link org.tinytim.Property#XTM10_REIFICATION} is set to <tt>false</tt> and
- * that the property {@link org.tinytim.Property#INHERIT_NAME_SCOPE} is enabled
- * (set to <tt>true</tt>).
+ * requires tinyTiM.
* </p>
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
* @version $Rev$ - $Date$
@@ -98,7 +90,7 @@
private static final String _XSD_ANY_URI = "http://www.w3.org/2001/XMLSchema#anyURI";
- private static final AssociationRole[] _EMPTY_ROLES = new AssociationRole[0];
+ private static final Role[] _EMPTY_ROLES = new Role[0];
private Topic _type;
private Topic _instance;
@@ -106,21 +98,21 @@
private CXTMWriter _out;
private final String _normBase;
- private Map<TopicMapObject, Integer> _construct2Id;
- private Map<Topic, List<AssociationRole>> _topic2Roles;
+ private Map<Construct, Integer> _construct2Id;
+ private Map<Topic, List<Role>> _topic2Roles;
private Map<String, String> _locator2Norm;
private Comparator<Topic> _topicComparator;
private Comparator<Association> _assocComparator;
- private Comparator<AssociationRole> _roleComparator;
+ private Comparator<Role> _roleComparator;
private Comparator<Occurrence> _occComparator;
- private Comparator<TopicName> _nameComparator;
+ private Comparator<Name> _nameComparator;
private Comparator<Variant> _variantComparator;
private Comparator<Set<Locator>> _locSetComparator;
private Comparator<Locator> _locComparator;
private Comparator<Set<Topic>> _scopeComparator;
- private Map<Association, AssociationRole[]> _assoc2Roles;
+ private Map<Association, Role[]> _assoc2Roles;
/**
* Creates a canonicalizer.
@@ -162,11 +154,11 @@
*/
public void write(TopicMap topicMap) throws IOException {
DuplicateRemovalUtils.removeDuplicates(topicMap);
- _construct2Id = new IdentityHashMap<TopicMapObject, Integer>();
+ _construct2Id = new IdentityHashMap<Construct, Integer>();
_locator2Norm = new HashMap<String, String>();
- _assoc2Roles = new IdentityHashMap<Association, AssociationRole[]>();
- _topic2Roles = new IdentityHashMap<Topic, List<AssociationRole>>();
- ITypeInstanceIndex typeInstanceIndex = ((TopicMapImpl) topicMap).getIndexManager().getTypeInstanceIndex();
+ _assoc2Roles = new IdentityHashMap<Association, Role[]>();
+ _topic2Roles = new IdentityHashMap<Topic, List<Role>>();
+ TypeInstanceIndex typeInstanceIndex = ((TopicMapImpl) topicMap).getIndexManager().getTypeInstanceIndex();
if (!typeInstanceIndex.isAutoUpdated()) {
typeInstanceIndex.reindex();
}
@@ -176,7 +168,7 @@
_createIndex(topics, assocs);
_out.startDocument();
AttributesImpl attrs = new AttributesImpl();
- _addReifier(attrs, (IReifiable)topicMap);
+ _addReifier(attrs, topicMap);
_out.startElement("topicMap", attrs);
_out.newline();
_writeItemIdentifiers(topicMap);
@@ -208,8 +200,7 @@
* @param idx A (upto date) type instance index.
* @return All topics which must be included into the output.
*/
- @SuppressWarnings("unchecked")
- private Topic[] _fetchTopics(TopicMap topicMap, ITypeInstanceIndex idx) {
+ private Topic[] _fetchTopics(TopicMap topicMap, TypeInstanceIndex idx) {
Collection<Topic> types = idx.getTopicTypes();
if (types.isEmpty()) {
Set<Topic> topics = topicMap.getTopics();
@@ -255,8 +246,7 @@
* @param idx A (upto date) type instance index.
* @return An unsorted array of associations which must be included into the output.
*/
- @SuppressWarnings("unchecked")
- private Association[] _fetchAssociations(TopicMap tm, ITypeInstanceIndex idx) {
+ private Association[] _fetchAssociations(TopicMap tm, TypeInstanceIndex idx) {
Collection<Topic> types = idx.getTopicTypes();
if (types.isEmpty()) {
Set<Association> assocs = tm.getAssociations();
@@ -281,7 +271,6 @@
* @param topics An array of topics.
* @param assocs An array of associations.
*/
- @SuppressWarnings("unchecked")
private void _createIndex(Topic[] topics, Association[] assocs) {
Arrays.sort(topics, _topicComparator);
Topic topic = null;
@@ -294,8 +283,8 @@
for (int i=0; i < assocs.length; i++) {
assoc = assocs[i];
_construct2Id.put(assoc, Integer.valueOf(i+1));
- Set<AssociationRole> roles_ = assoc.getAssociationRoles();
- AssociationRole[] roles = roles_.toArray(new AssociationRole[roles_.size()]);
+ Set<Role> roles_ = assoc.getRoles();
+ Role[] roles = roles_.toArray(new Role[roles_.size()]);
Arrays.sort(roles, _roleComparator);
_assoc2Roles.put(assoc, roles);
for (int j=0; j < roles.length; j++) {
@@ -310,8 +299,8 @@
* @param assoc The association to retrieve the roles from.
* @return A (maybe empty) sorted array of roles.
*/
- private AssociationRole[] _getRoles(Association assoc) {
- AssociationRole[] roles = _assoc2Roles.get(assoc);
+ private Role[] _getRoles(Association assoc) {
+ Role[] roles = _assoc2Roles.get(assoc);
return roles != null ? roles : _EMPTY_ROLES;
}
@@ -321,10 +310,9 @@
* @param topic The topic to retrieve the names from.
* @return A (maybe empty) sorted array of names.
*/
- @SuppressWarnings("unchecked")
- private TopicName[] _getNames(Topic topic) {
- Set<TopicName> names_ = topic.getTopicNames();
- TopicName[] names = names_.toArray(new TopicName[names_.size()]);
+ private Name[] _getNames(Topic topic) {
+ Set<Name> names_ = topic.getNames();
+ Name[] names = names_.toArray(new Name[names_.size()]);
Arrays.sort(names, _nameComparator);
return names;
}
@@ -335,8 +323,7 @@
* @param name The name to retrieve the variants from.
* @return A (maybe empty) sorted array of variants.
*/
- @SuppressWarnings("unchecked")
- private Variant[] _getVariants(TopicName name) {
+ private Variant[] _getVariants(Name name) {
Set<Variant> variants_ = name.getVariants();
Variant[] variants = variants_.toArray(new Variant[variants_.size()]);
Arrays.sort(variants, _variantComparator);
@@ -349,7 +336,6 @@
* @param topic The topic to retrieve the occurrences from.
* @return A (maybe emtpy) sorted array of occurrences.
*/
- @SuppressWarnings("unchecked")
private Occurrence[] _getOccurrences(Topic topic) {
Set<Occurrence> occs_ = topic.getOccurrences();
Occurrence[] occs = occs_.toArray(new Occurrence[occs_.size()]);
@@ -367,7 +353,7 @@
* @param tmo The Topic Maps construct to return the index of.
* @return The index of the Topic Maps construct.
*/
- private int _indexOf(TopicMapObject tmo) {
+ private int _indexOf(Construct tmo) {
return _construct2Id.get(tmo).intValue();
}
@@ -377,7 +363,6 @@
* @param topic The topic to serialize.
* @throws IOException If an error occurs.
*/
- @SuppressWarnings("unchecked")
private void _writeTopic(Topic topic) throws IOException {
AttributesImpl attrs = new AttributesImpl();
attrs.addAttribute("", "number", null, null, "" +_indexOf(topic));
@@ -386,7 +371,7 @@
_writeLocatorSet("subjectIdentifiers", topic.getSubjectIdentifiers());
_writeLocatorSet("subjectLocators", topic.getSubjectLocators());
_writeItemIdentifiers(topic);
- TopicName[] names = _getNames(topic);
+ Name[] names = _getNames(topic);
for (int i=0; i < names.length; i++) {
_writeName(names[i], i+1);
}
@@ -394,18 +379,18 @@
for (int i=0; i < occs.length; i++) {
_writeOccurrence(occs[i], i+1);
}
- Set<AssociationRole> roles_ = new HashSet<AssociationRole>(topic.getRolesPlayed());
- List<AssociationRole> alienRoles = _topic2Roles.get(topic);
+ Set<Role> roles_ = new HashSet<Role>(topic.getRolesPlayed());
+ List<Role> alienRoles = _topic2Roles.get(topic);
if (alienRoles != null) {
roles_.addAll(alienRoles);
}
- AssociationRole[] roles = roles_.toArray(new AssociationRole[roles_.size()]);
+ Role[] roles = roles_.toArray(new Role[roles_.size()]);
Arrays.sort(roles, _roleComparator);
AttributesImpl roleAttrs = new AttributesImpl();
StringBuilder sb = new StringBuilder();
for (int i=0; i < roles.length; i++) {
sb.append("association.")
- .append(_indexOf(roles[i].getAssociation()))
+ .append(_indexOf(roles[i].getParent()))
.append(".role.")
.append(_indexOf(roles[i]));
roleAttrs.addAttribute("", "ref", null, null, sb.toString());
@@ -425,18 +410,17 @@
* @param assoc The association to serialize.
* @throws IOException If an error occurs.
*/
- @SuppressWarnings("unchecked")
private void _writeAssociation(Association assoc) throws IOException {
_out.startElement("association", _attributes(assoc, _indexOf(assoc)));
_out.newline();
- _writeType((ITyped) assoc);
- for (AssociationRole role: _getRoles(assoc)) {
+ _writeType(assoc);
+ for (Role role: _getRoles(assoc)) {
_out.startElement("role", _attributes(role, _indexOf(role)));
_out.newline();
_out.startElement("player", _topicRef(role.getPlayer()));
_out.endElement("player");
_out.newline();
- _writeType((ITyped) role);
+ _writeType(role);
_writeItemIdentifiers(role);
_out.endElement("role");
_out.newline();
@@ -456,8 +440,8 @@
private void _writeOccurrence(Occurrence occ, int pos) throws IOException {
_out.startElement("occurrence", _attributes(occ, pos));
_out.newline();
- _writeDatatyped((IDatatypeAwareConstruct) occ);
- _writeType((ITyped) occ);
+ _writeDatatyped(occ);
+ _writeType(occ);
_writeScope(occ);
_writeItemIdentifiers(occ);
_out.endElement("occurrence");
@@ -470,8 +454,8 @@
* @param obj The construct to serialize.
* @throws IOException If an error occurs.
*/
- private void _writeDatatyped(IDatatypeAwareConstruct obj) throws IOException {
- String value = obj.getValue2();
+ private void _writeDatatyped(DatatypeAware obj) throws IOException {
+ String value = obj.getValue();
String datatype = obj.getDatatype().getReference();
//TODO: Handle xsd:decimal, xsd:integer, xsd:date, xsd:dateTime xsd:anyType(?!?)
if (_XSD_ANY_URI.equals(datatype)) {
@@ -493,14 +477,14 @@
* @param name The name to serialize.
* @throws IOException If an error occurs.
*/
- private void _writeName(TopicName name, int pos) throws IOException {
+ private void _writeName(Name name, int pos) throws IOException {
_out.startElement("name", _attributes(name, pos));
_out.newline();
_out.startElement("value");
_out.characters(name.getValue());
_out.endElement("value");
_out.newline();
- _writeType((ITyped) name);
+ _writeType(name);
_writeScope(name);
Variant[] variants = _getVariants(name);
Variant variant = null;
@@ -508,7 +492,7 @@
variant = variants[i];
_out.startElement("variant", _attributes(variant, i+1));
_out.newline();
- _writeDatatyped((IDatatypeAwareConstruct) variant);
+ _writeDatatyped(variant);
_writeScope(variant);
_writeItemIdentifiers(variant);
_out.endElement("variant");
@@ -526,7 +510,7 @@
* serialized.
* @throws IOException If an error occurs.
*/
- private void _writeType(ITyped typed) throws IOException {
+ private void _writeType(Typed typed) throws IOException {
Topic type = typed.getType();
if (type == null) {
_reportInvalid("The type of " + typed + " is null");
@@ -544,8 +528,7 @@
* @param scoped The scoped Topic Maps construct.
* @throws IOException If an error occurs.
*/
- @SuppressWarnings("unchecked")
- private void _writeScope(ScopedObject scoped) throws IOException {
+ private void _writeScope(Scoped scoped) throws IOException {
Set<Topic> scope = scoped.getScope();
if (scope.isEmpty()) {
return;
@@ -584,9 +567,8 @@
* @param tmo The Topic Maps construct to take the item identifiers from.
* @throws IOException If an error occurs.
*/
- @SuppressWarnings("unchecked")
- private void _writeItemIdentifiers(TopicMapObject tmo) throws IOException {
- _writeLocatorSet("itemIdentifiers", tmo.getSourceLocators());
+ private void _writeItemIdentifiers(Construct tmo) throws IOException {
+ _writeLocatorSet("itemIdentifiers", tmo.getItemIdentifiers());
}
/**
@@ -638,9 +620,9 @@
* @return Attributes which contain a reference to the reifier (if any) and
* the number of the provided Topic Maps construct.
*/
- private Attributes _attributes(TopicMapObject reifiable, int i) {
+ private Attributes _attributes(Reifiable reifiable, int i) {
AttributesImpl attrs = new AttributesImpl();
- _addReifier(attrs, (IReifiable)reifiable);
+ _addReifier(attrs, reifiable);
attrs.addAttribute("", "number", null, null, "" + i);
return attrs;
}
@@ -653,7 +635,7 @@
* @param attrs The attributes.
* @param reifiable The reifiable Topic Maps construct.
*/
- private void _addReifier(AttributesImpl attrs, IReifiable reifiable) {
+ private void _addReifier(AttributesImpl attrs, Reifiable reifiable) {
Topic reifier = reifiable.getReifier();
if (reifier != null) {
attrs.addAttribute("", "reifier", null, null, "" + _indexOf(reifier));
@@ -741,7 +723,6 @@
private final class TopicComparator implements Comparator<Topic> {
- @SuppressWarnings("unchecked")
public int compare(Topic o1, Topic o2) {
if (o1 == o2) {
return 0;
@@ -758,7 +739,7 @@
if (res == 0) {
res = _locSetComparator.compare(o1.getSubjectLocators(), o2.getSubjectLocators());
if (res == 0) {
- res = _locSetComparator.compare(o1.getSourceLocators(), o2.getSourceLocators());
+ res = _locSetComparator.compare(o1.getItemIdentifiers(), o2.getItemIdentifiers());
}
}
return res;
@@ -791,7 +772,7 @@
* first argument is less than, equal to, or greater than the
* second.
*/
- int compareType(ITyped o1, ITyped o2) {
+ int compareType(Typed o1, Typed o2) {
return _topicComparator.compare(o1.getType(), o2.getType());
}
/**
@@ -804,8 +785,7 @@
* first argument is less than, equal to, or greater than the
* second.
*/
- @SuppressWarnings("unchecked")
- int compareScope(ScopedObject o1, ScopedObject o2) {
+ int compareScope(Scoped o1, Scoped o2) {
return _scopeComparator.compare(o1.getScope(), o2.getScope());
}
}
@@ -824,8 +804,8 @@
* first argument is less than, equal to, or greater than the
* second.
*/
- int _compareValueDatatype(IDatatypeAwareConstruct o1, IDatatypeAwareConstruct o2) {
- int res = compareString(o1.getValue2(), o2.getValue2());
+ int _compareValueDatatype(DatatypeAware o1, DatatypeAware o2) {
+ int res = compareString(o1.getValue(), o2.getValue());
if (res == 0) {
res = compareString(o1.getDatatype().getReference(), o2.getDatatype().getReference());
}
@@ -842,20 +822,19 @@
*/
private final class AssociationComparator extends AbstractComparator<Association> {
- private Comparator<Set<AssociationRole>> _roleSetComparator;
+ private Comparator<Set<Role>> _roleSetComparator;
AssociationComparator() {
_roleSetComparator = new RoleSetComparator();
}
- @SuppressWarnings("unchecked")
public int compare(Association o1, Association o2) {
if (o1 == o2) {
return 0;
}
- int res = compareType((ITyped) o1, (ITyped) o2);
+ int res = compareType(o1, o2);
if (res == 0) {
- res = _roleSetComparator.compare(o1.getAssociationRoles(), o2.getAssociationRoles());
+ res = _roleSetComparator.compare(o1.getRoles(), o2.getRoles());
if (res == 0) {
res = compareScope(o1, o2);
}
@@ -869,15 +848,15 @@
* is meant to be used for roles where the parent is known to be equal or
* unequal.
*/
- private class RoleIgnoreParentComparator extends AbstractComparator<AssociationRole> {
+ private class RoleIgnoreParentComparator extends AbstractComparator<Role> {
- public int compare(AssociationRole o1, AssociationRole o2) {
+ public int compare(Role o1, Role o2) {
if (o1 == o2) {
return 0;
}
int res = _topicComparator.compare(o1.getPlayer(), o2.getPlayer());
if (res == 0) {
- res = compareType((ITyped) o1, (ITyped) o2);
+ res = compareType(o1, o2);
}
return res;
}
@@ -891,13 +870,13 @@
*/
private final class RoleComparator extends RoleIgnoreParentComparator {
- public int compare(AssociationRole o1, AssociationRole o2) {
+ public int compare(Role o1, Role o2) {
if (o1 == o2) {
return 0;
}
int res = super.compare(o1, o2);
if (res == 0) {
- res = _assocComparator.compare(o1.getAssociation(), o2.getAssociation());
+ res = _assocComparator.compare(o1.getParent(), o2.getParent());
}
return res;
}
@@ -917,9 +896,9 @@
if (o1 == o2) {
return 0;
}
- int res = _compareValueDatatype((IDatatypeAwareConstruct) o1, (IDatatypeAwareConstruct) o2);
+ int res = _compareValueDatatype(o1, o2);
if (res == 0) {
- res = compareType((ITyped) o1, (ITyped) o2);
+ res = compareType(o1, o2);
if (res == 0) {
res = compareScope(o1, o2);
}
@@ -936,15 +915,15 @@
* 3. [scope]
* 4. [parent]
*/
- private final class NameComparator extends AbstractComparator<TopicName> {
+ private final class NameComparator extends AbstractComparator<Name> {
- public int compare(TopicName o1, TopicName o2) {
+ public int compare(Name o1, Name o2) {
if (o1 == o2) {
return 0;
}
int res = compareString(o1.getValue(), o2.getValue());
if (res == 0) {
- res = compareType((ITyped) o1, (ITyped) o2);
+ res = compareType(o1, o2);
if (res == 0) {
res = compareScope(o1, o2);
}
@@ -966,7 +945,7 @@
if (o1 == o2) {
return 0;
}
- int res = _compareValueDatatype((IDatatypeAwareConstruct) o1, (IDatatypeAwareConstruct) o2);
+ int res = _compareValueDatatype(o1, o2);
if (res == 0) {
res = compareScope(o1, o2);
}
@@ -1010,7 +989,7 @@
/**
* Compares role sets. The parent of the roles is ignored!
*/
- private final class RoleSetComparator extends AbstractSetComparator<AssociationRole> {
+ private final class RoleSetComparator extends AbstractSetComparator<Role> {
private RoleIgnoreParentComparator _roleCmp;
@@ -1019,11 +998,11 @@
}
@Override
- int compareContent(Set<AssociationRole> o1, Set<AssociationRole> o2,
+ int compareContent(Set<Role> o1, Set<Role> o2,
int size) {
int res = 0;
- AssociationRole[] roles1 = o1.toArray(new AssociationRole[size]);
- AssociationRole[] roles2 = o2.toArray(new AssociationRole[size]);
+ Role[] roles1 = o1.toArray(new Role[size]);
+ Role[] roles2 = o2.toArray(new Role[size]);
Arrays.sort(roles1, _roleCmp);
Arrays.sort(roles2, _roleCmp);
for (int i=0; i < size && res == 0; i++) {
@@ -1093,7 +1072,6 @@
* of a topic, as associations.
*/
- @SuppressWarnings("unchecked")
private final class TypeInstanceTopic implements Topic {
private final Set<Locator> _sids;
@@ -1106,47 +1084,58 @@
return _sids;
}
- public void addSourceLocator(Locator arg0) throws DuplicateSourceLocatorException, MergeException { }
- public void addSubjectIdentifier(Locator arg0) throws MergeException {}
- public void addSubjectLocator(Locator arg0) throws MergeException, ModelConstraintException {}
+ public void addItemIdentifier(Locator arg0) { }
+ public void addSubjectIdentifier(Locator arg0) {}
+ public void addSubjectLocator(Locator arg0) {}
public void addType(Topic arg0) {}
- public Occurrence createOccurrence(String arg0, Topic arg1, Collection arg2) { return null; }
- public Occurrence createOccurrence(Locator arg0, Topic arg1, Collection arg2) { return null; }
- public TopicName createTopicName(String arg0, Collection arg1) throws MergeException { return null; }
- public TopicName createTopicName(String arg0, Topic arg1, Collection arg2) throws UnsupportedOperationException, MergeException { return null; }
- public Set getOccurrences() { return Collections.emptySet(); }
- public Set getReified() { return null; }
- public Set getRolesPlayed() { return Collections.emptySet(); }
- public Set getSubjectLocators() { return Collections.emptySet(); }
- public Set getTopicNames() { return Collections.emptySet(); }
- public Set getTypes() { return null; }
- public void mergeIn(Topic arg0) throws MergeException { }
+ public Set<Occurrence> getOccurrences() { return Collections.emptySet(); }
+ public Reifiable getReified() { return null; }
+ public Set<Role> getRolesPlayed() { return Collections.emptySet(); }
+ public Set<Locator> getSubjectLocators() { return Collections.emptySet(); }
+ public Set<Name> getNames() { return Collections.emptySet(); }
+ public Set<Topic> getTypes() { return null; }
+ public void mergeIn(Topic arg0) { }
public void remove() throws TopicInUseException { }
public void removeSubjectIdentifier(Locator arg0) { }
public void removeSubjectLocator(Locator arg0) { }
public void removeType(Topic arg0) { }
- public String getObjectId() { return null; }
- public Set getSourceLocators() { return Collections.emptySet(); }
+ public String getId() { return null; }
+ public Set<Locator> getItemIdentifiers() { return Collections.emptySet(); }
public TopicMap getTopicMap() { return null; }
- public void removeSourceLocator(Locator arg0) { }
+ public void removeItemIdentifier(Locator arg0) { }
+ public Name createName(String value, Collection<Topic> scope) { return null; }
+ public Name createName(String value, Topic... scope) {return null;}
+ public Name createName(Topic type, String value, Collection<Topic> scope) { return null; }
+ public Name createName(Topic type, String value, Topic... scope) { return null; }
+ public Occurrence createOccurrence(Topic type, Locator value, Collection<Topic> scope) { return null;}
+ public Occurrence createOccurrence(Topic type, Locator value, Topic... scope) {return null;}
+ public Occurrence createOccurrence(Topic type, String value, Collection<Topic> scope) { return null; }
+ public Occurrence createOccurrence(Topic type, String value, Locator datatype, Collection<Topic> scope) { return null; }
+ public Occurrence createOccurrence(Topic type, String value, Locator datatype, Topic... scope) { return null; }
+ public Occurrence createOccurrence(Topic type, String value, Topic... scope) { return null; }
+ public Set<Name> getNames(Topic type) { return null; }
+ public Set<Occurrence> getOccurrences(Topic type) { return null;}
+ public TopicMap getParent() { return null; }
+ public Set<Role> getRolesPlayed(Topic type, Topic assocType) { return null; }
+ public Set<Role> getRolesPlayed(Topic type) { return null; }
+
}
/**
* Used to represent type-instance relationships which are modelled as
* [type] property of topics.
*/
- @SuppressWarnings("unchecked")
- private final class TypeInstanceAssociation implements Association, IReifiable, ITyped {
+ private final class TypeInstanceAssociation implements Association {
- final Set<AssociationRole> _roles;
+ final Set<Role> _roles;
TypeInstanceAssociation(Topic type, Topic instance) {
- AssociationRole typeRole = new TypeInstanceRole(this, _type, type);
- AssociationRole instanceRole = new TypeInstanceRole(this, _instance, instance);
+ Role typeRole = new TypeInstanceRole(this, _type, type);
+ Role instanceRole = new TypeInstanceRole(this, _instance, instance);
_roles = new TypeInstanceRoleSet(typeRole, instanceRole);
}
- public Set<AssociationRole> getAssociationRoles() {
+ public Set<Role> getRoles() {
return _roles;
}
@@ -1154,30 +1143,27 @@
return _typeInstance;
}
+ public Set<Role> getRoles(Topic type) { return null; }
public void setReifier(Topic reifier) { }
public void addItemIdentifier(Locator itemIdentifier) { }
public Set<Locator> getItemIdentifiers() { return Collections.emptySet(); }
- public IConstruct getParent() { return null; }
+ public TopicMap getParent() { return null; }
public void removeItemIdentifier(Locator itemIdentifier) { }
- public AssociationRole createAssociationRole(Topic arg0, Topic arg1) { return null; }
+ public Role createRole(Topic arg0, Topic arg1) { return null; }
public Topic getReifier() { return null; }
- public void remove() throws TMAPIException {}
+ public void remove() {}
public void setType(Topic arg0) {}
- public void addScopingTopic(Topic arg0) {}
- public Set getScope() { return Collections.emptySet(); }
- public void removeScopingTopic(Topic arg0) {}
- public void addSourceLocator(Locator arg0) throws DuplicateSourceLocatorException {}
- public String getObjectId() { return null; }
- public Set getSourceLocators() { return Collections.emptySet(); }
+ public void addTheme(Topic arg0) {}
+ public Set<Topic> getScope() { return Collections.emptySet(); }
+ public void removeTheme(Topic arg0) {}
+ public String getId() { return null; }
public TopicMap getTopicMap() { return null; }
- public void removeSourceLocator(Locator arg0) {}
}
/**
* Immutable association role.
*/
- @SuppressWarnings("unchecked")
- private class TypeInstanceRole implements AssociationRole , IReifiable, ITyped {
+ private class TypeInstanceRole implements Role {
private final Topic _type;
private final Topic _player;
private final Association _parent;
@@ -1186,9 +1172,9 @@
_type = type;
_player = player;
_parent = parent;
- List<AssociationRole> roles = _topic2Roles.get(player);
+ List<Role> roles = _topic2Roles.get(player);
if (roles == null) {
- roles = new ArrayList<AssociationRole>();
+ roles = new ArrayList<Role>();
_topic2Roles.put(player, roles);
}
roles.add(this);
@@ -1205,35 +1191,32 @@
public void setReifier(Topic reifier) { }
public void addItemIdentifier(Locator itemIdentifier) { }
public Set<Locator> getItemIdentifiers() { return Collections.emptySet(); }
- public IConstruct getParent() { return (IConstruct) _parent; }
+ public Association getParent() { return _parent; }
public void removeItemIdentifier(Locator itemIdentifier) { }
public Association getAssociation() { return _parent; }
public Topic getReifier() { return null; }
- public void remove() throws TMAPIException {}
+ public void remove() {}
public void setPlayer(Topic arg0) {}
public void setType(Topic arg0) {}
- public void addSourceLocator(Locator arg0) throws DuplicateSourceLocatorException {}
- public String getObjectId() { return null; }
- public Set getSourceLocators() { return Collections.emptySet(); }
+ public String getId() { return null; }
public TopicMap getTopicMap() { return null; }
- public void removeSourceLocator(Locator arg0) {}
}
/**
* Immutable 'set' of two roles.
*/
- private static class TypeInstanceRoleSet extends AbstractSet<AssociationRole> {
+ private static class TypeInstanceRoleSet extends AbstractSet<Role> {
- private final AssociationRole _role1;
- private final AssociationRole _role2;
+ private final Role _role1;
+ private final Role _role2;
- TypeInstanceRoleSet(AssociationRole role1, AssociationRole role2) {
+ TypeInstanceRoleSet(Role role1, Role role2) {
_role1 = role1;
_role2 = role2;
}
@Override
- public Iterator<AssociationRole> iterator() {
+ public Iterator<Role> iterator() {
return new TypeInstanceRoleSetIterator();
}
@@ -1242,7 +1225,7 @@
return 2;
}
- private class TypeInstanceRoleSetIterator implements Iterator<AssociationRole> {
+ private class TypeInstanceRoleSetIterator implements Iterator<Role> {
private int _idx;
@@ -1250,7 +1233,7 @@
return _idx < 2;
}
- public AssociationRole next() {
+ public Role next() {
if (_idx > 1) {
throw new NoSuchElementException();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-04 12:30:19
|
Revision: 89
http://tinytim.svn.sourceforge.net/tinytim/?rev=89&view=rev
Author: lheuer
Date: 2008-08-04 12:30:28 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
made a copy
Added Paths:
-----------
tinytim-cxtm/branches/tinytim2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-04 12:29:09
|
Revision: 88
http://tinytim.svn.sourceforge.net/tinytim/?rev=88&view=rev
Author: lheuer
Date: 2008-08-04 12:29:19 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Removed Paths:
-------------
tinytim-cxtm/branches/tinytim2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-04 12:28:09
|
Revision: 87
http://tinytim.svn.sourceforge.net/tinytim/?rev=87&view=rev
Author: lheuer
Date: 2008-08-04 12:28:18 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
made a copy
Added Paths:
-----------
tinytim-cxtm/branches/tinytim2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-08-04 12:25:58
|
Revision: 86
http://tinytim.svn.sourceforge.net/tinytim/?rev=86&view=rev
Author: lheuer
Date: 2008-08-04 12:26:05 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Association: Removed unecessary setType/getType methods (they are provided by the superclass)
Modified Paths:
--------------
tinytim/trunk/src/main/java/org/tinytim/AssociationImpl.java
Modified: tinytim/trunk/src/main/java/org/tinytim/AssociationImpl.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/AssociationImpl.java 2008-07-28 16:55:01 UTC (rev 85)
+++ tinytim/trunk/src/main/java/org/tinytim/AssociationImpl.java 2008-08-04 12:26:05 UTC (rev 86)
@@ -39,7 +39,6 @@
IReifiable, ITyped, IScoped {
private Set<AssociationRole> _roles;
- private Topic _type;
AssociationImpl(TopicMapImpl topicMap) {
super(topicMap, null, null);
@@ -102,24 +101,6 @@
}
/* (non-Javadoc)
- * @see org.tmapi.core.Association#getType()
- */
- public Topic getType() {
- return _type;
- }
-
- /* (non-Javadoc)
- * @see org.tmapi.core.Association#setType(org.tmapi.core.Topic)
- */
- public void setType(Topic type) {
- if (_type == type) {
- return;
- }
- _fireEvent(Event.SET_TYPE, _type, type);
- _type = type;
- }
-
- /* (non-Javadoc)
* @see org.tmapi.core.TopicMapObject#remove()
*/
public void remove() throws TMAPIException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-28 16:54:53
|
Revision: 85
http://tinytim.svn.sourceforge.net/tinytim/?rev=85&view=rev
Author: lheuer
Date: 2008-07-28 16:55:01 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
made a copy
Added Paths:
-----------
tinytim/branches/tmapi-2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-28 16:53:58
|
Revision: 84
http://tinytim.svn.sourceforge.net/tinytim/?rev=84&view=rev
Author: lheuer
Date: 2008-07-28 16:54:07 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
Removed Paths:
-------------
tinytim/branches/tmapi-2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-28 16:52:14
|
Revision: 83
http://tinytim.svn.sourceforge.net/tinytim/?rev=83&view=rev
Author: lheuer
Date: 2008-07-28 16:52:23 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
Created folder remotely
Added Paths:
-----------
tinytim/branches/tmapi-2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-17 09:25:47
|
Revision: 82
http://tinytim.svn.sourceforge.net/tinytim/?rev=82&view=rev
Author: lheuer
Date: 2008-07-17 09:25:45 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
Initial directory structure for tinytim-io
Added Paths:
-----------
tinytim-io/
tinytim-io/branches/
tinytim-io/tags/
tinytim-io/trunk/
tinytim-io/trunk/src/
tinytim-io/trunk/src/main/
tinytim-io/trunk/src/main/java/
tinytim-io/trunk/src/main/java/org/
tinytim-io/trunk/src/main/java/org/tinytim/
tinytim-io/trunk/src/main/java/org/tinytim/io/
tinytim-io/trunk/src/test/
tinytim-io/trunk/src/test/java/
tinytim-io/trunk/src/test/java/org/
tinytim-io/trunk/src/test/java/org/tinytim/
tinytim-io/trunk/src/test/java/org/tinytim/io/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-17 09:15:09
|
Revision: 81
http://tinytim.svn.sourceforge.net/tinytim/?rev=81&view=rev
Author: lheuer
Date: 2008-07-17 09:15:16 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
Updated CHANGES
Modified Paths:
--------------
tinytim/trunk/CHANGES.txt
Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt 2008-07-02 12:32:12 UTC (rev 80)
+++ tinytim/trunk/CHANGES.txt 2008-07-17 09:15:16 UTC (rev 81)
@@ -2,7 +2,7 @@
Changes Log
===========
-1.5.0 alpha3 (xx.05.2008)
+1.5.0 alpha3 (xx.07.2008)
-------------------------
Bugfixes:
---------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-02 12:32:15
|
Revision: 80
http://tinytim.svn.sourceforge.net/tinytim/?rev=80&view=rev
Author: lheuer
Date: 2008-07-02 05:32:12 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
Small optimisation, using Integer.valueOf instead of new Integer
Modified Paths:
--------------
tinytim-cxtm/trunk/src/main/java/org/tinytim/cxtm/Canonicalizer.java
Modified: tinytim-cxtm/trunk/src/main/java/org/tinytim/cxtm/Canonicalizer.java
===================================================================
--- tinytim-cxtm/trunk/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-07-01 17:05:16 UTC (rev 79)
+++ tinytim-cxtm/trunk/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-07-02 12:32:12 UTC (rev 80)
@@ -85,7 +85,8 @@
* <p>
* The canonicalizer IS NOT a generic TMAPI-compatible implementation. It
* requires tinyTiM. The canonicalizer requires that the property
- * {@link org.tinytim.Property#INHERIT_NAME_SCOPE} is enabled
+ * {@link org.tinytim.Property#XTM10_REIFICATION} is set to <tt>false</tt> and
+ * that the property {@link org.tinytim.Property#INHERIT_NAME_SCOPE} is enabled
* (set to <tt>true</tt>).
* </p>
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
@@ -286,19 +287,19 @@
Topic topic = null;
for (int i=0; i < topics.length; i++) {
topic = topics[i];
- _construct2Id.put(topic, new Integer(i+1));
+ _construct2Id.put(topic, Integer.valueOf(i+1));
}
Arrays.sort(assocs, _assocComparator);
Association assoc = null;
for (int i=0; i < assocs.length; i++) {
assoc = assocs[i];
- _construct2Id.put(assoc, new Integer(i+1));
+ _construct2Id.put(assoc, Integer.valueOf(i+1));
Set<AssociationRole> roles_ = assoc.getAssociationRoles();
AssociationRole[] roles = roles_.toArray(new AssociationRole[roles_.size()]);
Arrays.sort(roles, _roleComparator);
_assoc2Roles.put(assoc, roles);
for (int j=0; j < roles.length; j++) {
- _construct2Id.put(roles[j], new Integer(j+1));
+ _construct2Id.put(roles[j], Integer.valueOf(j+1));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-01 17:05:32
|
Revision: 79
http://tinytim.svn.sourceforge.net/tinytim/?rev=79&view=rev
Author: lheuer
Date: 2008-07-01 10:05:16 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Updated build file to reflect the renaming from io to mio
Modified Paths:
--------------
tinytim-mio/trunk/build.xml
Modified: tinytim-mio/trunk/build.xml
===================================================================
--- tinytim-mio/trunk/build.xml 2008-07-01 17:01:52 UTC (rev 78)
+++ tinytim-mio/trunk/build.xml 2008-07-01 17:05:16 UTC (rev 79)
@@ -36,7 +36,7 @@
<target name="help">
<echo message="------------------------"/>
- <echo message="tinyTiM I/O - Build file"/>
+ <echo message="tinyTiM MIO - Build file"/>
<echo message="------------------------"/>
<echo message=""/>
<echo message="Available targets:"/>
@@ -48,12 +48,12 @@
<target name="init">
<property name="dist.version" value="${version}${version_suffix}"/>
- <property name="dist.name" value="tinytim-io-${dist.version}"/>
+ <property name="dist.name" value="tinytim-mio-${dist.version}"/>
- <property name="tinytim-io.jar" value="${dist.name}.jar"/>
- <property name="tinytim-io.tar" value="${dist.name}.tar"/>
- <property name="tinytim-io.tar.gz" value="${tinytim-io.tar}.gz"/>
- <property name="tinytim-io.zip" value="${dist.name}.zip"/>
+ <property name="tinytim-mio.jar" value="${dist.name}.jar"/>
+ <property name="tinytim-mio.tar" value="${dist.name}.tar"/>
+ <property name="tinytim-mio.tar.gz" value="${tinytim-mio.tar}.gz"/>
+ <property name="tinytim-mio.zip" value="${dist.name}.zip"/>
<property name="dir.build" value="${basedir}/build"/>
<property name="dir.dist.root" value="${dir.build}/dist"/>
@@ -91,8 +91,8 @@
use="true"
splitindex="true"
noindex="false"
- windowtitle="tinyTiM I/O API v${dist.version}"
- doctitle="tinyTiM API I/O v${dist.version}">
+ windowtitle="tinyTiM MIO API v${dist.version}"
+ doctitle="tinyTiM API MIO v${dist.version}">
<fileset dir="${dir.src}">
<exclude name="**/MapInputHandler.*"/>
</fileset>
@@ -160,12 +160,12 @@
<!-- Creates the jar -->
<!-- =================================================================== -->
<target name="jar" depends="compile">
- <jar destfile="${dir.build}/${tinytim-io.jar}">
+ <jar destfile="${dir.build}/${tinytim-mio.jar}">
<fileset dir="${dir.build.classes}">
<include name="**/*.*"/>
</fileset>
<manifest>
- <attribute name="Implementation-Title" value="tinyTiM I/O"/>
+ <attribute name="Implementation-Title" value="tinyTiM MIO"/>
<attribute name="Implementation-Version" value="${dist.version}"/>
<attribute name="Implementation-URL" value="http://sourceforge.net/projects/tinytim"/>
</manifest>
@@ -178,7 +178,7 @@
<target name="dist" depends="jar">
<mkdir dir="${dir.dist}"/>
- <copy todir="${dir.dist}" file="${dir.build}/${tinytim-io.jar}"/>
+ <copy todir="${dir.dist}" file="${dir.build}/${tinytim-mio.jar}"/>
<copy todir="${dir.dist}/src">
<fileset dir="${dir.src}"/>
@@ -204,11 +204,11 @@
<!-- Won't create the distribution files if a test fails -->
<!-- =================================================================== -->
<target name="release" depends="jar, test, doc, dist">
- <tar destfile="${dir.dist.root}/${tinytim-io.tar}"
+ <tar destfile="${dir.dist.root}/${tinytim-mio.tar}"
basedir="${dir.dist.root}"/>
- <gzip src="${dir.dist.root}/${tinytim-io.tar}"
- destfile="${dir.build}/${tinytim-io.tar.gz}" />
- <delete file="${dir.dist.root}/${tinytim-io.tar}" />
- <zip destfile="${dir.build}/${tinytim-io.zip}" basedir="${dir.dist.root}"/>
+ <gzip src="${dir.dist.root}/${tinytim-mio.tar}"
+ destfile="${dir.build}/${tinytim-mio.tar.gz}" />
+ <delete file="${dir.dist.root}/${tinytim-mio.tar}" />
+ <zip destfile="${dir.build}/${tinytim-mio.zip}" basedir="${dir.dist.root}"/>
</target>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-01 17:01:48
|
Revision: 78
http://tinytim.svn.sourceforge.net/tinytim/?rev=78&view=rev
Author: lheuer
Date: 2008-07-01 10:01:52 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Finished .io into .mio renaming
Modified Paths:
--------------
tinytim-mio/trunk/src/main/java/org/tinytim/mio/MapInputHandler.java
tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapImporter.java
tinytim-mio/trunk/src/test/java/org/tinytim/mio/TestMapInputHandler.java
Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/MapInputHandler.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/MapInputHandler.java 2008-07-01 16:59:05 UTC (rev 77)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/MapInputHandler.java 2008-07-01 17:01:52 UTC (rev 78)
@@ -18,7 +18,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-package org.tinytim.io;
+package org.tinytim.mio;
import java.util.ArrayList;
import java.util.Collection;
Modified: tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapImporter.java
===================================================================
--- tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapImporter.java 2008-07-01 16:59:05 UTC (rev 77)
+++ tinytim-mio/trunk/src/main/java/org/tinytim/mio/TopicMapImporter.java 2008-07-01 17:01:52 UTC (rev 78)
@@ -18,7 +18,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-package org.tinytim.io;
+package org.tinytim.mio;
import java.io.File;
import java.io.FileInputStream;
Modified: tinytim-mio/trunk/src/test/java/org/tinytim/mio/TestMapInputHandler.java
===================================================================
--- tinytim-mio/trunk/src/test/java/org/tinytim/mio/TestMapInputHandler.java 2008-07-01 16:59:05 UTC (rev 77)
+++ tinytim-mio/trunk/src/test/java/org/tinytim/mio/TestMapInputHandler.java 2008-07-01 17:01:52 UTC (rev 78)
@@ -18,7 +18,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-package org.tinytim.io;
+package org.tinytim.mio;
import org.tinytim.Property;
import org.tinytim.TopicMapImpl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-01 16:59:04
|
Revision: 77
http://tinytim.svn.sourceforge.net/tinytim/?rev=77&view=rev
Author: lheuer
Date: 2008-07-01 09:59:05 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Renamed .io into .mio
Added Paths:
-----------
tinytim-mio/trunk/src/main/java/org/tinytim/mio/
tinytim-mio/trunk/src/test/java/org/tinytim/mio/
Removed Paths:
-------------
tinytim-mio/trunk/src/main/java/org/tinytim/io/
tinytim-mio/trunk/src/test/java/org/tinytim/io/
Copied: tinytim-mio/trunk/src/main/java/org/tinytim/mio (from rev 76, tinytim-mio/trunk/src/main/java/org/tinytim/io)
Copied: tinytim-mio/trunk/src/test/java/org/tinytim/mio (from rev 76, tinytim-mio/trunk/src/test/java/org/tinytim/io)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-07-01 16:56:51
|
Revision: 76
http://tinytim.svn.sourceforge.net/tinytim/?rev=76&view=rev
Author: lheuer
Date: 2008-07-01 09:57:00 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
Renamed tinytim-io into tinytim-mio
Added Paths:
-----------
tinytim-mio/
Removed Paths:
-------------
tinytim-io/
Copied: tinytim-mio (from rev 75, tinytim-io)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lis...@us...> - 2008-06-27 23:49:27
|
Revision: 75
http://tinytim.svn.sourceforge.net/tinytim/?rev=75&view=rev
Author: lischke2
Date: 2008-06-27 16:49:36 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
for fixing bugs
Added Paths:
-----------
tinytim-io/trunk/src/test/parseRoles.xtm
tinytim-io/trunk/src/test/parseRoles2.xtm
Added: tinytim-io/trunk/src/test/parseRoles.xtm
===================================================================
--- tinytim-io/trunk/src/test/parseRoles.xtm (rev 0)
+++ tinytim-io/trunk/src/test/parseRoles.xtm 2008-06-27 23:49:36 UTC (rev 75)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<topicMap xmlns="http://www.topicmaps.org/xtm/1.0/">
+ <topic id="1073409678563">
+ <instanceOf>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#picture"></topicRef>
+ </instanceOf>
+ <subjectIdentity>
+ <resourceRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.ivs.tu-berlin.de/Lischke/bilderbuch/1mai/images/Foto(03).jpg"></resourceRef>
+ </subjectIdentity>
+ </topic>
+ <topic id="1073409692594">
+ <instanceOf>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#person"></topicRef>
+ </instanceOf>
+ <baseName id="1073409692595">
+ <baseNameString>Joachim Fuchs</baseNameString>
+ </baseName>
+ </topic>
+
+ <association id="1073409717985">
+ <instanceOf>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#personinaction"></topicRef>
+ </instanceOf>
+ <member id="1073409717986">
+ <roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#picture"></topicRef>
+ </roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#1073409678563"></topicRef>
+ </member>
+ <member id="1073409717987">
+ <roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#person"></topicRef>
+ </roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#1073409692594"></topicRef>
+ </member>
+ </association>
+</topicMap>
\ No newline at end of file
Added: tinytim-io/trunk/src/test/parseRoles2.xtm
===================================================================
--- tinytim-io/trunk/src/test/parseRoles2.xtm (rev 0)
+++ tinytim-io/trunk/src/test/parseRoles2.xtm 2008-06-27 23:49:36 UTC (rev 75)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<topicMap xmlns="http://www.topicmaps.org/xtm/1.0/">
+ <topic id="picture">
+ <baseName>
+ <baseNameString>a picture</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="person">
+ <baseName>
+ <baseNameString>a person</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="group">
+ <baseName>
+ <baseNameString>a person</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="item">
+ <baseName>
+ <baseNameString>an item</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="action">
+ <baseName>
+ <baseNameString>an action</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="place">
+ <baseName>
+ <baseNameString>a place</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="event">
+ <baseName>
+ <baseNameString>an event</baseNameString>
+ </baseName>
+ </topic>
+
+<!-- Association standards -->
+
+ <topic id="isgroup">
+ <baseName>
+ <baseNameString>some persons and a group</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="personinaction">
+ <baseName>
+ <baseNameString>person in an action</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="where">
+ <baseName>
+ <baseNameString>something is somewhere</baseNameString>
+ </baseName>
+ </topic>
+
+ <topic id="ispartof">
+ <baseName>
+ <baseNameString>something belongs to an event</baseNameString>
+ </baseName>
+ </topic>
+
+
+ <topic id="1073409678563">
+ <instanceOf>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#picture"></topicRef>
+ </instanceOf>
+ <subjectIdentity>
+ <resourceRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.ivs.tu-berlin.de/Lischke/bilderbuch/1mai/images/Foto(03).jpg"></resourceRef>
+ </subjectIdentity>
+ </topic>
+ <topic id="1073409692594">
+ <instanceOf>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#person"></topicRef>
+ </instanceOf>
+ <baseName id="1073409692595">
+ <baseNameString>Joachim Fuchs</baseNameString>
+ </baseName>
+ </topic>
+
+ <association id="1073409717985">
+ <instanceOf>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#personinaction"></topicRef>
+ </instanceOf>
+ <member id="1073409717986">
+ <roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#picture"></topicRef>
+ </roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#1073409678563"></topicRef>
+ </member>
+ <member id="1073409717987">
+ <roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#person"></topicRef>
+ </roleSpec>
+ <topicRef xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#1073409692594"></topicRef>
+ </member>
+ </association>
+</topicMap>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lis...@us...> - 2008-06-27 23:48:59
|
Revision: 74
http://tinytim.svn.sourceforge.net/tinytim/?rev=74&view=rev
Author: lischke2
Date: 2008-06-27 16:49:04 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
for fixing bugs
Added Paths:
-----------
tinytim-io/trunk/src/test/java/org/tinytim/io/ParseRolesTest.java
Added: tinytim-io/trunk/src/test/java/org/tinytim/io/ParseRolesTest.java
===================================================================
--- tinytim-io/trunk/src/test/java/org/tinytim/io/ParseRolesTest.java (rev 0)
+++ tinytim-io/trunk/src/test/java/org/tinytim/io/ParseRolesTest.java 2008-06-27 23:49:04 UTC (rev 74)
@@ -0,0 +1,44 @@
+package org.tinytim.io;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.tmapi.core.Topic;
+import org.tmapi.core.TopicMap;
+import org.tmapi.core.TopicMapSystem;
+import org.tmapi.core.TopicMapSystemFactory;
+
+
+public class ParseRolesTest extends TestCase {
+
+ public void testBugImportWithoutException() throws Exception{
+ TopicMapSystemFactory tmSysFactory = TopicMapSystemFactory.newInstance();
+// tmSysFactory.setProperty(Property.XTM10_REIFICATION, "false");
+ TopicMapSystem tmSys = tmSysFactory.newTopicMapSystem();
+ TopicMap tm = tmSys.createTopicMap("");
+ TopicMapImporter.importInto(tm, "", new File("src/test/parseRoles.xtm"));
+ assertEquals(2,tm.getTopics().size());
+ }
+ public void testBugImportRoles() throws Exception{
+ TopicMapSystemFactory tmSysFactory = TopicMapSystemFactory.newInstance();
+// tmSysFactory.setProperty(Property.XTM10_REIFICATION, "false");
+ TopicMapSystem tmSys = tmSysFactory.newTopicMapSystem();
+ TopicMap tm = tmSys.createTopicMap("");
+ TopicMapImporter.importInto(tm, "", new File("src/test/parseRoles.xtm"));
+ assertEquals(1,tm.getAssociations().size());
+ assertNotNull(((Topic)tm.getTopics().iterator().next()).getRolesPlayed());
+ assertEquals(1,((Topic)tm.getTopics().iterator().next()).getRolesPlayed().size());
+ }
+
+ public void testBugImportRoles2() throws Exception{
+ TopicMapSystemFactory tmSysFactory = TopicMapSystemFactory.newInstance();
+// tmSysFactory.setProperty(Property.XTM10_REIFICATION, "false");
+ TopicMapSystem tmSys = tmSysFactory.newTopicMapSystem();
+ TopicMap tm = tmSys.createTopicMap("");
+ TopicMapImporter.importInto(tm, "", new File("src/test/parseRoles2.xtm"));
+ assertEquals(1,tm.getAssociations().size());
+ assertNotNull(((Topic)tm.getTopics().iterator().next()).getRolesPlayed());
+ assertEquals(1,((Topic)tm.getTopics().iterator().next()).getRolesPlayed().size());
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lis...@us...> - 2008-06-27 22:24:23
|
Revision: 73
http://tinytim.svn.sourceforge.net/tinytim/?rev=73&view=rev
Author: lischke2
Date: 2008-06-27 15:24:31 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
missing tmapi jar in the io project, dependency on tinytim project does not give acces to the tmapi.jar there
Added Paths:
-----------
tinytim-io/trunk/lib/tmapi-1_0SP1.jar
Added: tinytim-io/trunk/lib/tmapi-1_0SP1.jar
===================================================================
(Binary files differ)
Property changes on: tinytim-io/trunk/lib/tmapi-1_0SP1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-05-29 12:36:33
|
Revision: 72
http://tinytim.svn.sourceforge.net/tinytim/?rev=72&view=rev
Author: lheuer
Date: 2008-05-29 05:36:29 -0700 (Thu, 29 May 2008)
Log Message:
-----------
- IRI reuses the java.net.URI now. The hash code uses the String reference
Modified Paths:
--------------
tinytim/trunk/src/main/java/org/tinytim/IRI.java
Modified: tinytim/trunk/src/main/java/org/tinytim/IRI.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/IRI.java 2008-05-27 13:21:15 UTC (rev 71)
+++ tinytim/trunk/src/main/java/org/tinytim/IRI.java 2008-05-29 12:36:29 UTC (rev 72)
@@ -48,6 +48,16 @@
_uri = URI.create(_reference.replace(" ", "%20"));
}
+ private IRI(URI uri) {
+ try {
+ _reference = URLDecoder.decode(uri.toString(), "utf-8");
+ }
+ catch (UnsupportedEncodingException ex) {
+ throw new TMAPIRuntimeException(ex);
+ }
+ _uri = uri;
+ }
+
/* (non-Javadoc)
* @see org.tmapi.core.Locator#getNotation()
*/
@@ -66,7 +76,7 @@
* @see org.tmapi.core.Locator#resolveRelative(java.lang.String)
*/
public Locator resolveRelative(String reference) {
- return new IRI(_uri.resolve(reference).toString());
+ return new IRI(_uri.resolve(reference));
}
/* (non-Javadoc)
@@ -81,7 +91,7 @@
*/
@Override
public boolean equals(Object obj) {
- return this == obj || (obj instanceof IRI && _uri.equals(((IRI) obj)._uri));
+ return this == obj || (obj instanceof IRI && _reference.equals(((IRI) obj)._reference));
}
/* (non-Javadoc)
@@ -89,7 +99,7 @@
*/
@Override
public int hashCode() {
- return _uri.hashCode();
+ return _reference.hashCode();
}
/* (non-Javadoc)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-05-27 13:21:10
|
Revision: 71
http://tinytim.svn.sourceforge.net/tinytim/?rev=71&view=rev
Author: lheuer
Date: 2008-05-27 06:21:15 -0700 (Tue, 27 May 2008)
Log Message:
-----------
Modified Paths:
--------------
tinytim/trunk/CHANGES.txt
Modified: tinytim/trunk/CHANGES.txt
===================================================================
--- tinytim/trunk/CHANGES.txt 2008-05-27 13:16:44 UTC (rev 70)
+++ tinytim/trunk/CHANGES.txt 2008-05-27 13:21:15 UTC (rev 71)
@@ -1,31 +1,40 @@
-===========
-Changes Log
-===========
-
-1.5.0 alpha2 (05.05.2008)
--------------------------
-Features:
-- ``voc`` package added which provides access to common PSIs.
-- ``DuplicateRemovalUtils`` added. Used to remove
- duplicate Topic Maps constructs from topic maps, topics,
- associations, and names
-- ``TypeInstanceConverter`` added. Used to convert
- type-instance associations into the topic's [types]
- property.
-- ``tmapi.TopicNamesIndex``, ``tmapi.OccurrenceIndex``
- and ``tmapi.VarinatsIndex`` use an optimized reindex
- algorithm.
-- Property to let ``Variant`` instances return the union
- of their 'own' scope and the parent's scope.
-
-Bugfixes:
-- ``DatatypeAwareConstruct`` sent wrong event. Fixed
-- All indexes return copies of their collections to avoid
- concurrent modification exceptions.
-
-
-1.5.0 alpha1 (25.04.2008)
--------------------------
-- Initial 1.5.x release
-- New code base
-- Java 1.5
+===========
+Changes Log
+===========
+
+1.5.0 alpha3 (xx.05.2008)
+-------------------------
+Bugfixes:
+---------
+* Bug #1970502 (Locator impl does no reference unescaping)
+
+
+1.5.0 alpha2 (05.05.2008)
+-------------------------
+Bugfixes:
+--------
+* ``DatatypeAwareConstruct`` sent wrong event. Fixed
+* All indexes return copies of their collections to avoid
+ concurrent modification exceptions.
+
+Features:
+---------
+* ``voc`` package added which provides access to common PSIs.
+* ``DuplicateRemovalUtils`` added. Used to remove
+ duplicate Topic Maps constructs from topic maps, topics,
+ associations, and names
+* ``TypeInstanceConverter`` added. Used to convert
+ type-instance associations into the topic's [types]
+ property.
+* ``tmapi.TopicNamesIndex``, ``tmapi.OccurrenceIndex``
+ and ``tmapi.VarinatsIndex`` use an optimized reindex
+ algorithm.
+* Property to let ``Variant`` instances return the union
+ of their 'own' scope and the parent's scope.
+
+
+1.5.0 alpha1 (25.04.2008)
+-------------------------
+* Initial 1.5.x release
+* New code base
+* Java 1.5
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-05-27 13:16:40
|
Revision: 70
http://tinytim.svn.sourceforge.net/tinytim/?rev=70&view=rev
Author: lheuer
Date: 2008-05-27 06:16:44 -0700 (Tue, 27 May 2008)
Log Message:
-----------
IRI normalization
Modified Paths:
--------------
tinytim/trunk/src/main/java/org/tinytim/IRI.java
Modified: tinytim/trunk/src/main/java/org/tinytim/IRI.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/IRI.java 2008-05-24 15:29:21 UTC (rev 69)
+++ tinytim/trunk/src/main/java/org/tinytim/IRI.java 2008-05-27 13:16:44 UTC (rev 70)
@@ -20,9 +20,12 @@
*/
package org.tinytim;
+import java.io.UnsupportedEncodingException;
import java.net.URI;
+import java.net.URLDecoder;
import org.tmapi.core.Locator;
+import org.tmapi.core.TMAPIRuntimeException;
/**
* Immutable representation of an IRI.
@@ -33,15 +36,18 @@
public final class IRI implements Locator {
private final URI _uri;
+ private final String _reference;
public IRI(String reference) {
- this(URI.create(reference));
+ try {
+ _reference = URLDecoder.decode(reference, "utf-8");
+ }
+ catch (UnsupportedEncodingException ex) {
+ throw new TMAPIRuntimeException(ex);
+ }
+ _uri = URI.create(_reference.replace(" ", "%20"));
}
- private IRI(URI uri) {
- _uri = uri;
- }
-
/* (non-Javadoc)
* @see org.tmapi.core.Locator#getNotation()
*/
@@ -53,14 +59,14 @@
* @see org.tmapi.core.Locator#getReference()
*/
public String getReference() {
- return _uri.toString();
+ return _reference;
}
/* (non-Javadoc)
* @see org.tmapi.core.Locator#resolveRelative(java.lang.String)
*/
public Locator resolveRelative(String reference) {
- return new IRI(_uri.resolve(reference));
+ return new IRI(_uri.resolve(reference).toString());
}
/* (non-Javadoc)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
.jpg"></resourceRef>){kind=link}