Menu
▾
▴
tinytim-commits
|
From: <lh...@us...> - 2008-05-07 11:31:14
|
Revision: 55
http://tinytim.svn.sourceforge.net/tinytim/?rev=55&view=rev
Author: lheuer
Date: 2008-05-07 04:31:20 -0700 (Wed, 07 May 2008)
Log Message:
-----------
- Added some identity comp.
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-05-05 14:53:21 UTC (rev 54)
+++ tinytim-cxtm/trunk/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-05-07 11:31:20 UTC (rev 55)
@@ -86,7 +86,7 @@
* (set to <tt>true</tt>).
*
* @author Lars Heuer (heuer[at]semagia.com) <a href="http://www.semagia.com/">Semagia</a>
- * @version $Rev:$ - $Date:$
+ * @version $Rev$ - $Date$
*/
public final class Canonicalizer {
@@ -182,6 +182,7 @@
_out.endElement("topicMap");
_out.newline();
_out.endDocument();
+ _out = null;
_construct2Id = null;
_locator2Norm = null;
_assoc2Roles = null;
@@ -821,7 +822,7 @@
}
/**
- * Abstract comparator that provides some utility method which handle common
+ * Abstract comparator that provides some utility methods which handle common
* comparisons.
*/
private abstract class AbstractComparator<T> implements Comparator<T> {
@@ -905,6 +906,9 @@
@SuppressWarnings("unchecked")
public int compare(Association o1, Association o2) {
+ if (o1 == o2) {
+ return 0;
+ }
int res = compareType((ITyped) o1, (ITyped) o2);
if (res == 0) {
res = _roleSetComparator.compare(o1.getAssociationRoles(), o2.getAssociationRoles());
@@ -923,6 +927,9 @@
private class RoleIgnoreParentComparator extends AbstractComparator<AssociationRole> {
public int compare(AssociationRole o1, AssociationRole o2) {
+ if (o1 == o2) {
+ return 0;
+ }
int res = _topicComparator.compare(o1.getPlayer(), o2.getPlayer());
if (res == 0) {
res = compareType((ITyped) o1, (ITyped) o2);
@@ -959,6 +966,9 @@
private final class OccurrenceComparator extends AbstractDatatypeAwareComparator<Occurrence> {
public int compare(Occurrence o1, Occurrence o2) {
+ if (o1 == o2) {
+ return 0;
+ }
int res = _compareValueDatatype((IDatatypeAwareConstruct) o1, (IDatatypeAwareConstruct) o2);
if (res == 0) {
res = compareType((ITyped) o1, (ITyped) o2);
@@ -981,6 +991,9 @@
private final class NameComparator extends AbstractComparator<TopicName> {
public int compare(TopicName o1, TopicName o2) {
+ if (o1 == o2) {
+ return 0;
+ }
int res = compareString(o1.getValue(), o2.getValue());
if (res == 0) {
res = compareType((ITyped) o1, (ITyped) o2);
@@ -1002,6 +1015,9 @@
private final class VariantComparator extends AbstractDatatypeAwareComparator<Variant> {
public int compare(Variant o1, Variant o2) {
+ if (o1 == o2) {
+ return 0;
+ }
int res = _compareValueDatatype((IDatatypeAwareConstruct) o1, (IDatatypeAwareConstruct) o2);
if (res == 0) {
res = compareScope(o1, o2);
@@ -1115,6 +1131,9 @@
private final class LocatorComparator implements Comparator<Locator> {
public int compare(Locator o1, Locator o2) {
+ if (o1 == o2) {
+ return 0;
+ }
return _normalizeLocator(o1.getReference()).compareTo(_normalizeLocator(o2.getReference()));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-05-24 08:13:03
|
Revision: 66
http://tinytim.svn.sourceforge.net/tinytim/?rev=66&view=rev
Author: lheuer
Date: 2008-05-24 01:13:04 -0700 (Sat, 24 May 2008)
Log Message:
-----------
- Updated JavaDoc (setting org.tinytim.Property#XTM10_REIFICATION is NO requirement anymore)
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-05-16 17:58:24 UTC (rev 65)
+++ tinytim-cxtm/trunk/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-05-24 08:13:04 UTC (rev 66)
@@ -85,8 +85,7 @@
* <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
+ * {@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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lh...@us...> - 2008-05-24 15:28:37
|
Revision: 68
http://tinytim.svn.sourceforge.net/tinytim/?rev=68&view=rev
Author: lheuer
Date: 2008-05-24 08:27:43 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Fixed bug #1971341
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-05-24 15:24:58 UTC (rev 67)
+++ tinytim-cxtm/trunk/src/main/java/org/tinytim/cxtm/Canonicalizer.java 2008-05-24 15:27:43 UTC (rev 68)
@@ -436,6 +436,7 @@
_out.endElement("player");
_out.newline();
_writeType((ITyped) role);
+ _writeItemIdentifiers(role);
_out.endElement("role");
_out.newline();
}
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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X