xmimerge 0.0.1

data/lib/xmimerge/merge_packages.rb

@@ -0,0 +1,81 @@
+require File.join(File.dirname(__FILE__), 'merge.rb')
+require File.join(File.dirname(__FILE__), 'merge_classes.rb')
+require File.join(File.dirname(__FILE__), 'merge_use_cases.rb')
+
+class MergePackages < Merge
+
+	def initialize()
+		super()
+	end
+
+	def verify
+
+		@log.debug("Checking Packages...") if @only_check
+
+		@from.packages.each do |package|
+			check_changes package
+		end		
+
+		check_removed
+
+	end
+
+	def check_changes(from_package)
+
+		@log.info("Checking Package #{from_package.full_name}") if @only_check
+
+		to_package = @to.package_by_full_name(from_package.full_name)
+
+		if to_package.nil?
+			new_obj from_package
+		else
+			check_existing_package(from_package, to_package)
+		end	
+	end
+
+	def new_obj(from_package)
+		command = "+ Package #{from_package.full_name}"
+		@commands.add_command_to_buffer(command)
+	end
+
+	def check_existing_package(from_package, to_package)
+
+		@log.debug("Checking existing package '#{from_package.name}'...") if @only_check
+
+		merge = MergeClasses.new(from_package, to_package)
+		@only_check ? merge.check : merge.merge
+
+		merge = MergeUseCases.new(from_package, to_package)
+		@only_check ? merge.check : merge.merge		
+	end
+
+	def check_removed
+
+		@log.debug("Checking Removed Packages...") if @only_check
+
+		@to.packages.each do |to_package|
+			
+			ok = false
+			@from.packages.each do |from_package|
+
+				if from_package.full_name == to_package.full_name
+					ok = true
+					break
+				end
+			end
+			if !ok
+				@log.info("Package removed: #{to_package.full_name}") if @only_check			
+				command = "- Package #{to_package.full_name}"
+				@commands.add_command_to_buffer(command)
+				unless @only_check 
+					if @commands.has_command?(command)
+						@log.info "[OK] #{command}"
+					else
+						#@log.info "[NOT] #{command}"
+					end
+				end
+			end
+		end		
+	end
+
+end

data/lib/xmimerge/merge_parameters.rb

@@ -0,0 +1,89 @@
+require File.join(File.dirname(__FILE__), 'merge.rb')
+
+class MergeParameters < Merge
+
+	def initialize(name, from_tag, to_tag)
+		super()
+		@name = name
+		@from_tag = from_tag
+		@to_tag = to_tag
+	end
+
+	def verify
+
+		@from_tag.parameters.each do |from_parameter|
+			check_changes(from_parameter)
+		end
+
+		check_removed
+
+	end
+
+	def check_changes(from_parameter)
+
+		@log.debug("Checking #{@name}Parameter #{from_parameter.full_name}...")
+
+		to_parameter = @to_tag.parameter_by_name(from_parameter.name)
+
+		if to_parameter.nil?
+			new_obj from_parameter
+		else
+			check_existing(from_parameter, to_parameter)
+		end	
+	end
+
+	def new_obj(from_parameter)
+
+		@log.debug("New Parameter #{from_parameter.name}...")
+
+		command = "+ #{@name}Parameter #{@from_tag.full_name} {'#{from_parameter.name}'}"
+		@commands.add_command_to_buffer(command)
+		unless @only_check 
+			if @commands.has_command?(command)
+				@log.info "[OK] #{command}"
+			else
+				#@log.info "[NOT] #{command}"
+			end
+		end	
+	end
+
+	def check_existing(from_parameter, to_parameter)
+
+		# TODO
+
+		# kind
+
+		# UML:Parameter.type
+
+		# Stereotypes		
+		merge = MergeStereotypes.new("#{@name}Parameter", from_parameter, to_parameter)
+		@only_check ? merge.check : merge.merge		
+
+		# TaggedValues
+		merge = MergeTaggedValues.new("#{@name}Parameter", from_parameter, to_parameter)
+		@only_check ? merge.check : merge.merge		
+	end
+
+	def check_removed
+		to_parameters = @to_tag.parameters.each do |to_parameter|
+			ok = false
+			@from_tag.parameters.each do |from_parameter|
+				if to_parameter.name == from_parameter.name
+					ok = true
+					break
+				end
+			end
+			if !ok		
+				command = "- #{@name}Parameter #{@from_tag.full_name} {'#{to_parameter.name}'}"
+				@commands.add_command_to_buffer(command)
+				unless @only_check 
+					if @commands.has_command?(command)
+						@log.info "[OK] #{command}"
+					else
+						#@log.info "[NOT] #{command}"
+					end
+				end
+			end
+		end		
+	end
+end

data/lib/xmimerge/merge_pseudo_states.rb

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), 'merge_states.rb')
+
+class MergePseudoStates < MergeStates
+
+	def initialize(from_activity_graph, to_activity_graph)
+		super("PseudoState", "pseudo_states", from_activity_graph, to_activity_graph)
+	end
+
+end

data/lib/xmimerge/merge_signal_events.rb

@@ -0,0 +1,71 @@
+require File.join(File.dirname(__FILE__), 'merge.rb')
+require File.join(File.dirname(__FILE__), 'merge_parameters.rb')
+
+class MergeSignalEvents < Merge
+
+	def initialize(from_use_case, to_use_case)
+		super()
+		@from_use_case = from_use_case
+		@to_use_case = to_use_case
+	end	
+
+	def verify
+		#@from_use_case.signal_events.each do |from_signal_event|		
+		#	check_changes(from_signal_event)
+		#end
+
+		#check_removed			
+	end
+
+	def check_changes(from_signal_event)
+		@log.debug("Checking Signal Event #{from_signal_event.name}...")
+
+		to_signal_event = @to_use_case.signal_event_by_name(from_signal_event.name)
+
+		if to_signal_event.nil?
+			new_obj from_signal_event
+		else
+			check_existing(from_signal_event, to_signal_event)
+		end			
+	end
+
+	def check_removed
+
+		to_signal_events = @to_use_case.signal_events.each do |to_signal_event|
+			
+			ok = false
+			@from_use_case.signal_events.each do |from_signal_event|
+
+				if from_signal_event.name == to_signal_event.name
+					ok = true
+					break
+				end
+			end
+			if !ok
+				command = "- SignalEvent #{@from_use_case.full_name}::#{to_signal_event.name}"
+				@commands.add_command_to_buffer(command)
+				unless @only_check 
+					if @commands.has_command?(command)
+						@log.info "[OK] #{command}"
+					else
+						#@log.info "[NOT] #{command}"
+					end
+				end
+			end
+		end			
+	end
+
+	def new_obj(from_signal_event)
+		command = "+ SignalEvent #{@from_use_case.full_name}::#{from_signal_event.name}"		
+		@commands.add_command_to_buffer(command)		
+	end
+
+	def check_existing(from_signal_event, to_signal_event)
+
+		@log.debug("Checking existing Signal Event: #{@from_use_case.full_name}::#{from_signal_event.name}")
+
+		# Parameters
+		merge = MergeParameters.new("SignalEvent", from_signal_event, to_signal_event)
+		@only_check ? merge.check : merge.merge		
+	end
+end

data/lib/xmimerge/merge_states.rb

@@ -0,0 +1,81 @@
+require File.join(File.dirname(__FILE__), 'merge.rb')
+require File.join(File.dirname(__FILE__), 'merge_stereotypes.rb')
+require File.join(File.dirname(__FILE__), 'merge_tagged_values.rb')
+
+class MergeStates < Merge
+
+	def initialize(name_state, method_name, from_activity_graph, to_activity_graph)
+		super()
+		@name_state = name_state
+		@from_activity_graph = from_activity_graph
+		@to_activity_graph = to_activity_graph
+		@method_name = method_name
+	end
+
+	def verify
+
+		@from_activity_graph.send(@method_name).each do |state|
+			check_changes state
+		end		
+
+		check_removed
+	end
+
+	def check_changes(from_state)
+
+		to_state = @to_activity_graph.state_by_name(@name_state, from_state.name)
+
+		@log.debug("Checking #{@name_state} #{from_state.full_name}")
+
+		if to_state.nil?
+			new_obj from_state
+		else
+			check_existing(from_state, to_state)
+		end		
+	end
+
+	def new_obj(from_action_state)
+		command = "+ #{@name_state} #{from_action_state.full_name}"
+		@commands.add_command_to_buffer(command)
+	end
+
+	def check_existing(from_action_state, to_action_state)
+
+		# Stereotypes		
+		merge = MergeStereotypes.new(@name_state, from_action_state, to_action_state)
+		@only_check ? merge.check : merge.merge
+
+		# TaggedValues
+		merge = MergeTaggedValues.new(@name_state, from_action_state, to_action_state)
+		@only_check ? merge.check : merge.merge		
+	end
+
+	def check_removed
+
+		@log.debug("Checking Removed #{@name_state}...")
+
+		@to_activity_graph.send(@method_name).each do |to_action_state|
+			
+			ok = false
+			@from_activity_graph.send(@method_name).each do |from_action_state|
+
+				if from_action_state.name == to_action_state.name
+					ok = true
+					break
+				end
+			end
+			if !ok
+				@log.debug("#{@name_state} Removed: #{to_action_state.full_name}")				
+				command = "- #{@name_state} #{to_action_state.full_name}"
+				@commands.add_command_to_buffer(command)
+				unless @only_check 
+					if @commands.has_command?(command)
+						@log.info "[OK] #{command}"
+					else
+						#@log.info "[NOT] #{command}"
+					end
+				end
+			end
+		end			
+	end
+end

data/lib/xmimerge/merge_stereotypes.rb

@@ -0,0 +1,82 @@
+require File.join(File.dirname(__FILE__), 'merge.rb')
+
+class MergeStereotypes < Merge
+
+	def initialize(name, from_tag, to_tag)
+		super()
+		@name = name
+		@from_tag = from_tag
+		@to_tag = to_tag
+	end
+
+	def verify
+
+		@from_tag.stereotypes.each do |from_stereotype|
+			check_changes(from_stereotype)
+		end
+
+		check_removed
+
+	end
+
+	def check_changes(from_stereotype)
+
+		@log.debug("Checking Stereotype of #{@name} #{from_stereotype.name}...")
+
+		to_stereotype = @to_tag.stereotype_by_name(from_stereotype.name)
+
+		if to_stereotype.nil?
+			new_stereotype from_stereotype
+		end	
+	end
+
+	def new_stereotype(from_stereotype)
+
+		@log.debug("New Stereotype of #{@name} #{from_stereotype.name}...")
+
+		command = "\t+ #{@name}Stereotype #{@from_tag.full_name} {'#{from_stereotype.name}'}"
+		@commands.add_command_to_buffer(command)
+		unless @only_check 
+			if @commands.has_command?(command)
+				@to_tag.add_xml_stereotype(from_stereotype.xml)
+				@log.info "[OK] #{command}"
+			else
+				@log.debug "[NOT] #{command}"
+			end
+		end	
+	end
+
+	def check_removed
+		@to_tag.stereotypes.each do |to_stereotype|
+
+			#puts "Xml stereotype: #{to_stereotype.xml}"
+			#puts "Xml stereotype parent: #{to_stereotype.xml.parent}\n\n"	
+
+			ok = false
+			@from_tag.stereotypes.each do |from_stereotype|
+				if to_stereotype.name == from_stereotype.name
+					ok = true
+					break
+				end
+			end
+			if !ok		
+				command = "\t- #{@name}Stereotype #{@from_tag.full_name} {'#{to_stereotype.name}'}"
+				@commands.add_command_to_buffer(command)
+				unless @only_check 
+					if @commands.has_command?(command)
+											
+						to_stereotype.xml.inner_html = "asdasd"
+						@to_tag.stereotypes.delete(to_stereotype)
+
+						#puts "testando: #{to_stereotype.xml}"
+						#puts "testando: #{@to_tag.xml}"
+						@log.info "[OK] #{command}"
+					else
+						@log.debug "[NOT] #{command}"
+					end
+				end
+			end
+		end		
+	end
+
+end

data/lib/xmimerge/merge_tagged_values.rb

@@ -0,0 +1,75 @@
+require File.join(File.dirname(__FILE__), 'merge.rb')
+
+class MergeTaggedValues < Merge
+
+	def initialize(name, from_tag, to_tag)
+		super()
+		@name = name
+		@from_tag = from_tag
+		@to_tag = to_tag
+	end
+
+	def verify
+		@from_tag.tagged_values.each do |from_tagged_value|
+			check_new(from_tagged_value)
+		end
+		check_removed
+	end
+
+	def check_new(from_tagged_value)
+
+		@log.debug("Checking TaggedValue of #{@name} '#{from_tagged_value.name}'...") if @only_check
+
+		to_tagged_value = @to_tag.tagged_value_by_name(from_tagged_value.name)
+		if to_tagged_value.nil?			
+
+			@log.debug("New Tagged Value #{from_tagged_value.name}...") if @only_check
+			command = "\t+ #{@name}TaggedValue #{@from_tag.full_name} {'#{from_tagged_value.name}' = '#{from_tagged_value.value}'}"
+			@commands.add_command_to_buffer(command)
+			unless @only_check 
+				if @commands.has_command?(command)
+					@to_tag.add_xml_tagged_value(from_tagged_value.xml.to_xml)	
+					@log.info "[OK] #{command}"
+				else
+					#@log.info "[NOT] #{command}"
+				end
+			end
+		else
+			if from_tagged_value.value != to_tagged_value.value
+				@log.debug("Change Tagged Value #{from_tagged_value.name}...") if @only_check
+				command = "\t* #{@name}TaggedValue #{@from_tag.full_name} {'#{from_tagged_value.name}'} '#{to_tagged_value.value}' --> '#{from_tagged_value.value}'"
+				@commands.add_command_to_buffer(command)
+				unless @only_check 
+					if @commands.has_command?(command)
+						@log.info "[OK] #{command}"
+					else
+						#@log.info "[NOT] #{command}"
+					end
+				end
+			end
+		end		
+	end
+
+	def check_removed
+		to_tagged_values = @to_tag.tagged_values.each do |to_tagged_value|
+			ok = false
+			@from_tag.tagged_values.each do |from_tagged_value|
+				if to_tagged_value.name == from_tagged_value.name
+					ok = true
+					break
+				end
+			end
+			if !ok
+				command = "\t- #{@name}TaggedValue #{@from_tag.full_name} {'#{to_tagged_value.name}'}"
+				@commands.add_command_to_buffer(command)
+				unless @only_check 
+					if @commands.has_command?(command)
+						@log.info "[OK] #{command}"
+					else
+						#@log.info "[NOT] #{command}"
+					end
+				end
+			end
+		end		
+	end	
+end