Changeset 667
- Timestamp:
- 11/09/06 13:47:36 (4 years ago)
- Location:
- Jupe/src/org/jupe
- Files:
-
- 3 modified
-
editors/classdiagram/model/nodes/MethodElement.java (modified) (1 diff)
-
plugin/JupeLog.java (modified) (1 diff)
-
uml2model/UML2ModelRoot.java (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Jupe/src/org/jupe/editors/classdiagram/model/nodes/MethodElement.java
r663 r667 38 38 import org.jupe.editors.classdiagram.model.validators.ParameterListValidator; 39 39 import org.jupe.editors.classdiagram.model.validators.TypeNameValidator; 40 import org.jupe.plugin.JupeLog;41 40 import org.jupe.plugin.exceptions.JupeExceptionLogOnly; 42 41 import org.jupe.synchronisation.Util; -
Jupe/src/org/jupe/plugin/JupeLog.java
r582 r667 80 80 logList.add(message); 81 81 if (shouldBePrinted) { 82 System.out.println( "[debug] " + message);82 System.out.println(new StringBuffer("[debug] ").append(message)); 83 83 } 84 84 } -
Jupe/src/org/jupe/uml2model/UML2ModelRoot.java
r662 r667 237 237 // .uml2 238 238 // files for synchronization 239 String id;239 StringBuffer id; 240 240 241 241 if (isConnection(element)) { 242 id = element.getClass().getSimpleName() + "_" + element.hashCode() 243 + "_" + System.currentTimeMillis(); 242 id = new StringBuffer(element.getClass().getSimpleName()); 243 id.append("_"); 244 id.append(element.hashCode()); 245 id.append("_"); 246 id.append(System.currentTimeMillis()); 244 247 } else if (element instanceof NamedElement) { 245 id = getAbsoluteName((NamedElement) element) + "_" 246 + element.hashCode(); 248 id = new StringBuffer(getAbsoluteName((NamedElement) element)); 249 id.append("_"); 250 id.append(element.hashCode()); 247 251 } else { 248 id = "unnamed_element_" + element.hashCode(); 249 } 250 addToIDHash(id, element); 252 id = new StringBuffer("unnamed_element_") 253 .append(element.hashCode()); 254 } 255 addToIDHash(id.toString(), element); 251 256 } 252 257 … … 294 299 * hidden packages and noHiddenPackage is true. 295 300 */ 296 public String getAbsoluteName( NamedElement element,301 public String getAbsoluteName(final NamedElement element, 297 302 final boolean noHiddenPackages) { 298 303 if (element.equals(model)) { … … 314 319 } 315 320 316 while (((element = (NamedElement) element.getOwner()) != null) 317 && !element.equals(model)) { 318 name = element.getName() + "." + name; 321 // old code: does the new one work? 322 /* 323 * while (((element = (NamedElement) element.getOwner()) != null) && 324 * !element.equals(model)) { name = element.getName() + "." + name; } 325 */ 326 327 NamedElement tempElement = element; 328 329 while (true) { 330 tempElement = (NamedElement) tempElement.getOwner(); 331 if (tempElement == null || tempElement.equals(model)) { 332 break; 333 } 334 name = new StringBuffer(tempElement.getName()).append(".").append( 335 name).toString(); 319 336 } 320 337 … … 617 634 if (!(structuralFeature.getFeatureID() == UMLPackage.TYPED_ELEMENT__TYPE || structuralFeature 618 635 .getFeatureID() == UMLPackage.INSTANCE_SPECIFICATION__CLASSIFIER)) { 619 JupePlugin.getDefault().println( 620 "Skipping feature " + structuralFeature.getName() 621 + " (" + structuralFeature.getFeatureID() 622 + ") " + " while searching references to type"); 636 JupePlugin 637 .getDefault() 638 .println( 639 new StringBuffer("Skipping feature ") 640 .append(structuralFeature.getName()) 641 .append(" (") 642 .append( 643 structuralFeature 644 .getFeatureID()) 645 .append( 646 ") while searching references to type")); 623 647 continue; 624 648 }
