Revision: 326
http://tinytim.svn.sourceforge.net/tinytim/?rev=326&view=rev
Author: lheuer
Date: 2009-07-22 17:44:29 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
Finally, all tests pass
Modified Paths:
--------------
tinytim/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java
Modified: tinytim/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java
===================================================================
--- tinytim/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java 2009-07-22 17:31:46 UTC (rev 325)
+++ tinytim/trunk/src/main/java/org/tinytim/mio/TinyTimMapInputHandler.java 2009-07-22 17:44:29 UTC (rev 326)
@@ -248,7 +248,6 @@
if (scope.isUnconstrained() || name.getScopeObject().equals(scope)) {
_reportError("The variant has no scope");
}
- _handleDelayedReifier(variant);
}
/* (non-Javadoc)
@@ -552,11 +551,13 @@
IConstruct reified = (IConstruct) reifier.getReified();
if (SignatureGenerator.generateSignature(c) ==
SignatureGenerator.generateSignature(reified)) {
-
MergeUtils.moveItemIdentifiers(reifiable, reifier.getReified());
if (c.isAssociation()) {
MergeUtils.moveRoleCharacteristics((Association) c, (Association) reifier.getReified());
}
+ else if (c.isName()) {
+ MergeUtils.moveVariants((IName)c, (IName) reified);
+ }
reifiable.remove();
return reifier.getReified();
}
@@ -648,14 +649,6 @@
|| a.getParent().equals(b.getParent()));
}
- private void _replaceConstructOnStack(Construct source, IConstruct target) {
- for (int i=0; i <_constructSize; i++) {
- if (_constructStack[i].equals(source)) {
- _constructStack[i] = target;
- }
- }
- }
-
/**
* Merges the <tt>source</tt> topic with the <tt>target</tt>.
*
@@ -667,7 +660,11 @@
* @param target The target topic.
*/
private void _merge(Topic source, ITopic target) {
- _replaceConstructOnStack(source, target);
+ for (int i=0; i <_constructSize; i++) {
+ if (_constructStack[i].equals(source)) {
+ _constructStack[i] = target;
+ }
+ }
for (Reifiable reifiable: CollectionFactory.createList(_delayedReification.keySet())) {
Topic topic = _delayedReification.get(reifiable);
if (topic.equals(target)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
