rrt_ruby 0.3.0-mswin32 → 0.3.1-mswin32

data/lib/rrt_ruby.rb

@@ -87,6 +87,7 @@ module RRT_RUBY
 			@logger.debug("Opening model #{@modelname}")
 			@app=WIN32OLE.new(OLEAPP_NAME)
 			@model=@app.OpenModel(@modelname) unless modelname.empty?
+			@model=@app.CurrentModel if modelname.empty?
 			raise FinderException.new(@modelname),"Model not loaded" unless @model
 		end
 		#open is used in conjuction with a block.
@@ -120,6 +121,7 @@ module RRT_RUBY
 				@modelname=modelname
 				@model=@app.openmodel(@modelname)
 				raise FinderException.new(@modelname),"Model not loaded" unless @model
+				raise FinderException.new(@modelname),"Model not loaded"  unless @model.GetFileName.upcase==modelname.upcase
 			end if @app && @app.CurrentModel.GetFileName.upcase!=modelname.upcase
 		end
 		#Stops the RRTFinder releasing the OLE interface and invalidating this RRTFinder instance.

data/lib/rrt_ruby/writer.rb

@@ -19,44 +19,28 @@ module RRT_RUBY
 		#
 		#Things that can go wrong:
 		#
-		#* The parent package for _package_ does not exist
+		#* The parent package for _package_ does not exist 
+		#* The parent package is not defined and _package_ is not Logical View
 		#* The parent package for _package_ is not writeable
+		#
 		def add_logical_package package,save=true
-			@logger.debug("Adding #{package.to_s}")
-			#if no parent it goes directly to logical view
-			if package.parent.empty?
-				host=@model.RootLogicalPackage 
-			else
-				#find if the parent exists
-				host=ole_element(package.parent,TYPE_LOGICAL_PACKAGE)
-			end
+			@logger.debug("Writing #{package.to_s}")
+			#check parentage
+			raise ModelException, "No parent package specified" if package.parent.empty?&&package.name!="Logical View"
+			host=@model.RootLogicalPackage if package.name=="Logical View"
+			#find if the parent exists
+			host=ole_element(package.parent,TYPE_LOGICAL_PACKAGE) unless host
 			if host
-				if host.IsModifiable
-					#add the package
-					added_package=host.AddLogicalPackage(package.name)
-					added_package.stereotype=package.stereotype
-					#add all the classes
-					package.classes.each{|c|
-						add_class(c,added_package)
+				#if the package is "Logical View", write it's subpackages, else write the package
+				if package.name=="Logical View"
+					package.packages.each{|pkg|
+						write_logical_package(pkg,host)
 					}
-					#add all the contained packages
-					package.packages.each{|p|
-						add_logical_package(p,false)
-					}
-					#save if wanted
-					begin
-						update_relations(package)
-						#show so that no errors are generated when dialogs pop up
-						self.show
-						#save, hide and invalidated the view cache
-						unit=host.GetContainingControlledElement
-						raise ModelException,"Could not save#{unit.name}" unless unit.Save
-						self.hide
-						@logical_view=nil
-					end if save
 				else
-					raise ModelException,"#{host.name} is not writable"
+					write_logical_package(package,host)
 				end
+				update_relations(package)
+				save(host) if save
 			else
 				raise ModelException,"#{package.parent} does not exist in the model"
 			end
@@ -69,34 +53,25 @@ module RRT_RUBY
 		#
 		#* The parent package for _package_ does not exist
 		#* _package_ does not exist
+		#* The parent package is not defined and _package_ is not Logical View
 		#* The parent package for _package_ is not writeable
 		def remove_logical_package package
 			@logger.debug("Removing #{package.to_s}")
-			#if no parent it goes directly to logical view
-			if package.parent.empty?
-				host=@model.RootLogicalPackage
-				@logger.debug("...from the root logical package")
-			else
-				#find if the parent exists
-				host=ole_element(package.parent,TYPE_LOGICAL_PACKAGE)
-			end
+			#check parentage
+			raise ModelException, "No parent package specified" if package.parent.empty?&&package.name!="Logical View"
+			host=@model.RootLogicalPackage if package.name=="Logical View"
+			#find if the parent exists
+			host=ole_element(package.parent,TYPE_LOGICAL_PACKAGE) unless host
 			if host
-				if host.IsModifiable
-					pkg=ole_element(package.qualified_name,TYPE_LOGICAL_PACKAGE)
-					if pkg
-						self.show
-						#delete the package
-						host.DeleteLogicalPackage(pkg)
-						unit=host.GetContainingControlledElement
-						raise ModelException,"Could not save#{unit.name}" unless unit.Save
-						self.hide
-						@logical_view=nil
-					else
-						@logger.info("#{package.name} does not exist in the model") 
-					end
+				#if the package is "Logical View", write it's subpackages, else write the package
+				if package.name=="Logical View"
+					package.packages.each{|pkg|
+						delete_logical_package(pkg,host)
+					}
 				else
-					raise ModelException,"#{host.name} is not writable"
+					delete_logical_package(package,host)
 				end
+				save(host)
 			else
 				raise ModelException,"#{package.parent} does not exist in the model"
 			end
@@ -115,6 +90,50 @@ module RRT_RUBY
 		end
 		
 		private
+		#
+		def save host
+			#show so that no errors are generated when dialogs pop up
+			self.show
+			#save, hide and invalidated the view cache
+			unit=host.GetContainingControlledElement
+			raise ModelException,"Could not save#{unit.name}" unless unit.Save
+			self.hide
+			@logical_view=nil
+		end
+		#
+		def write_logical_package package,host
+			if host.IsModifiable
+				#add the package
+				added_package=host.AddLogicalPackage(package.name)
+				added_package.stereotype=package.stereotype
+				#add all the classes
+				package.classes.each{|c|
+					add_class(c,added_package)
+				}
+				#add all the contained packages
+				package.packages.each{|p|
+					write_logical_package(p,added_package)
+				}
+			else
+				raise ModelException,"#{host.name} is not writable"
+			end
+		end
+		#
+		def delete_logical_package package,host
+			if host.IsModifiable
+				pkg=ole_element(package.qualified_name,TYPE_LOGICAL_PACKAGE)
+				if pkg
+					#delete the package
+					host.DeleteLogicalPackage(pkg)
+					@logical_view=nil
+				else
+					@logger.info("#{package.name} does not exist in the model") 
+				end
+				
+			else
+				raise ModelException,"#{host.name} is not writable"
+			end
+		end
 		#Adds _c_ to the OLE _package_element_
 		def add_class c,package_element
 			added=package_element.AddClass(c.name)
@@ -123,6 +142,7 @@ module RRT_RUBY
 		#Adds _c_ to the OLE _package_element_
 		def add_capsule c,package_element
 			added=package_element.AddCapsule(c.name)
+			added.stereotype=c.stereotype
 		end
 		
 		
@@ -150,9 +170,13 @@ module RRT_RUBY
 							when Relation::CLASS
 								el.AddClassDependency("",r.supplier)
 							when Relation::COMPONENT
+								
 							when Relation::PACKAGE
+								
 							when Relation::GENERALIZATION
+								
 							when Relation::REALIZE
+								
 						end
 					rescue
 						@logger.warn("Could not add dependency: #{$!}")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: rrt_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2005-10-19
+  version: 0.3.1
+date: 2005-10-20
 summary: rrt_ruby is a Ruby library providing access to Rose RealTime models through RRTEI
 require_paths: 
   - lib