Changeset 502 for trunk/org.modelica.uml.sysml.diagram2/src/org

Timestamp:

04/20/07 16:26:34 (17 years ago)

Author:

x07vasba

Message:

 

File:

• trunk/org.modelica.uml.sysml.diagram2/src/org/modelica/uml/sysml/diagram2/part/SysmlInheritanceDiagramAction.java (modified) (8 diffs)

trunk/org.modelica.uml.sysml.diagram2/src/org/modelica/uml/sysml/diagram2/part/SysmlInheritanceDiagramAction.java

@@ -141 +141 @@
             classType = result[0].trim();
             classType = classType.substring(1, classType.length()-1);
-            
+
             //Out of memory debugging
-            if(createdNodes.size()== 88){
+            if(classes[i].equals("Modelica.Blocks.Interfaces.RealInput")){
                 int breakp = 0;
             }
-            
+
             createdEditPart = createEmptyNodeEditPart(classType);
             createdNode = new CustomNode(classType.trim(),classes[i],createdEditPart);
-                
+
             createdNodes.add(createdNode);
 
             command = "getClassNames("+ classes[i]+ ")";
-            
+
             String retval="";
 
@@ -162 +162 @@
 
             }
-            
+
             org.modelica.mdt.core.List list = null;
             try{
@@ -178 +178 @@
 
             }
-        
-            result = new String[list.size()];
-            
-            for(int j =0;j<list.size();j++){
-                
-                result[j] = classes[i] + "." + list.elementAt(j).toString();
-                String tmpResult = result[j];
-            }
-            createInheritanceNodesList(result);
-        }
-        
+
+            if(list != null){
+                result = new String[list.size()];
+
+                for(int j =0;j<list.size();j++){
+
+                    result[j] = classes[i] + "." + list.elementAt(j).toString();
+                    String tmpResult = result[j];
+                }
+                createInheritanceNodesList(result);
+            }
+        }
+
     }
 
@@ -213 +215 @@
             
             for(int i=0;i<inheritanceCount;i++){
-                omcCommand = "getNthInheritedClass("+ sourceNode.getName()+","+i+")";
+                omcCommand = "getNthInheritedClass("+ sourceNode.getName()+","+(i+1)+")";
                 
                 try{
@@ -222 +224 @@
                 }
 
+                omcResult = omcResult.trim();
+                //omcResult = omcResult.substring(1, omcResult.length()-1);
+                
                 EditPart targetEditPart = getEditPart(omcResult);
                 
@@ -245 +250 @@
                     SysmlDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
         
-        Command command = connectionRequest.getCreateCommand(connectionRequest,
-                (EditPart)editPart.getChildren().get(0), 
-                (EditPart)editPart.getChildren().get(1));
+        Command command = connectionRequest.getCreateCommand(connectionRequest,source, target);
         
         if (command == null || !(command.canExecute())) {
@@ -296 +299 @@
 
             //Set the location of the node in the diagram
-            if(startPoint.y<200)
+            if(startPoint.x<200)
                 startPoint.x += 100;
             else{
                 startPoint.y += 100;
                 startPoint.x = 0;
+                
             }
                 
@@ -343 +347 @@
         while(listIterator.hasNext()){
             CustomNode tempNode = (CustomNode)listIterator.next();
-            if(tempNode.getName()== name){
+            if(tempNode.getName().equals(name)){
                 return tempNode.getNodeEditPart();
             }