Index: /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.core.resources.prefs
===================================================================
--- /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.core.resources.prefs	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/.settings/org.eclipse.core.resources.prefs	(revision 25894)
@@ -1,3 +1,3 @@
-#Fri Apr 15 18:36:49 CEST 2011
+#Thu Apr 21 10:41:33 CEST 2011
 eclipse.preferences.version=1
 encoding//uml/oldConcept.uml=UTF-8
@@ -5,4 +5,2 @@
 encoding//uml/refactoring.uml=UTF-8
 encoding//uml/refactoring.umlclass=UTF-8
-encoding//uml/rendering.uml=UTF-8
-encoding//uml/rendering.umlseq=UTF-8
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java	(revision 25894)
@@ -176,5 +176,6 @@
                 saveProperties();
             }
-        });        
+        });
+        //TODO read deinterlacers list out of videoengine
         VDeinterlacer= new JMenu("Deinterlacer");
         VIntNone= new JRadioButtonMenuItem(new JosmAction(tr("none"), null, tr("no deinterlacing"),null, false) {            
@@ -217,13 +218,16 @@
         fc.setSelectedFile(new File(mostRecentFolder));
         if(fc.showOpenDialog(Main.main.parent)!=JFileChooser.CANCEL_OPTION)
-        {
+        {        	
         	mostRecentFolder=fc.getSelectedFile().getAbsolutePath();
         	saveProperties();
-        	videoPositionLayer= new VideoPositionLayer(gpsLayer);
-        	gpsVideoPlayer = new GPSVideoPlayer(new SimpleDateFormat("hh:mm:ss") ,videoPositionLayer);
-        	gpsVideoPlayer.setJumpLength(jumpLength);
-        	gpsVideoPlayer.setLoopLength(loopLength);
-        	gpsVideoPlayer.addVideo(fc.getSelectedFile());
-        	enableVideoControlMenus(true);
+        	if(videoPositionLayer==null)
+        	{
+        		videoPositionLayer= new VideoPositionLayer(gpsLayer);
+            	gpsVideoPlayer = new GPSVideoPlayer(new SimpleDateFormat("hh:mm:ss") ,videoPositionLayer);
+            	gpsVideoPlayer.setJumpLength(jumpLength);
+            	gpsVideoPlayer.setLoopLength(loopLength);
+            	enableVideoControlMenus(true);
+        	}        	
+        	gpsVideoPlayer.addVideo(fc.getSelectedFile());        	
         }
 		
@@ -272,17 +276,5 @@
     }
 	
-	private void applySettings()
-	{
-		//GUI
-        VCenterIcon.setSelected(autoCenter);
-        VIntNone.setSelected(true);
-        if(deinterlacer=="")
-        	VIntNone.setSelected(true);
-        if(deinterlacer=="bob")
-        	VIntBob.setSelected(true);
-        if(deinterlacer=="linear")
-        	VIntLinear.setSelected(true);
-	}
-	
+
 	private void showJumpTo()
 	{
@@ -345,4 +337,6 @@
 
 	public void layerRemoved(Layer arg0) {
+		if(arg0 instanceof VideoPositionLayer)
+			enableVideoControlMenus(false);
 		activeLayerChange(null,arg0);
 		
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java	(revision 25894)
@@ -14,4 +14,5 @@
 // a specific synced video
 public class GPSVideo extends Video{
+	private static final String SYNC_KEY = "synced";
 	public JComponent SyncComponent;
 	private WayPoint syncWayPoint;
@@ -23,16 +24,19 @@
 	private VideoPositionLayer videoPositionLayer;
 	
-	public GPSVideo(File filename) {
-		super(filename);
+	public GPSVideo(File filename, String id) {
+		super(filename,id);
 	}
 	
 	public GPSVideo(Video video)
 	{
-		super(video.filename);
+		super(video.filename,video.id);
 		this.player=video.player;
 	}
 	
+	//calculates attributes basing upon the current position
 	public void doSync(VideoPositionLayer layer) {
 		this.videoPositionLayer=layer;
+		if (isSynced())
+			removeSyncedWayPoints();
 		syncWayPoint=layer.getCurrentWayPoint();
 		syncVideoTime=getCurrentTime();
@@ -44,7 +48,4 @@
 		markSyncedWayPoints();
 		Main.map.mapView.repaint();
-		System.out.println(firstWayPoint.getTime());
-		System.out.println(lastWayPoint.getTime());
-
 	}
 
@@ -72,4 +73,14 @@
 		}
 	}
+	
+	private void removeSyncedWayPoints() {
+		List <WayPoint> track =videoPositionLayer.getTrack();
+		int start=track.indexOf(firstWayPoint);
+		int end=track.indexOf(lastWayPoint);
+		List <WayPoint> ls =videoPositionLayer.getTrack().subList(start, end);
+		for (WayPoint n : ls) {
+			n.attr.keySet().remove(SYNC_KEY);
+		}				
+	}
 
 	private void markSyncedWayPoints() {
@@ -79,8 +90,6 @@
 		List <WayPoint> ls =videoPositionLayer.getTrack().subList(start, end);
 		for (WayPoint n : ls) {
-			n.attr.put("synced", Boolean.TRUE);
-		}
-		
-		
+			n.attr.put(SYNC_KEY, id);
+		}				
 	}
 
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java	(revision 25894)
@@ -43,23 +43,35 @@
 
 
-	@Override
 	public GPSVideo addVideo(File Videofile) {		
-		GPSVideo video = new GPSVideo(super.addVideo(Videofile));
+		GPSVideo video = new GPSVideo(super.addVideo(Videofile,Integer.toString(videos.size())));
+		enableSingleVideoMode(true);
 		videos.add(video);
+		addSyncButton(video);
+		return video;
+	}
+
+
+	private void addSyncButton(GPSVideo video) {
 		JButton syncButton= new JButton(tr("Sync"));
 		syncButton.setBackground(Color.RED);		
 		syncButton.addActionListener(new ActionListener() {
-            //do a sync
             public void actionPerformed(ActionEvent e) {
-            	GPSVideo v=findVideo((JButton)e.getSource());
-            	v.doSync(videoPositionLayer);
-            }
+            	resync(e);
+            }			
 		});
 		video.SyncComponent=syncButton;
 		//video.panel.add(syncButton,BorderLayout.SOUTH);
 		controlsPanel.add(syncButton);
-		return video;
 	}	
 
+	//do a (re)sync
+	private void resync(ActionEvent e) {
+		JButton btn =(JButton)e.getSource();
+    	GPSVideo v=findVideo(btn);
+    	v.doSync(videoPositionLayer);
+    	btn.setBackground(Color.GREEN);
+    	enableSingleVideoMode(false);
+	}
+	
 	protected GPSVideo findVideo(JButton source) {
 		for (GPSVideo v : videos) {
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/Video.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/Video.java	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/Video.java	(revision 25894)
@@ -12,10 +12,12 @@
 public class Video {
 	public File filename;
+	public String id; //unique id to make it easy to identify
 	public MediaPlayer player;
 	public Canvas canvas;
-	public JPanel panel;
+	public JPanel panel;	
 	
-	public Video(File filename) {
+	public Video(File filename, String id) {
 		this.filename=filename;
+		this.id=id;
 		canvas=new Canvas();
 		panel=new JPanel();
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java	(revision 25894)
@@ -31,6 +31,8 @@
 	private final String[] libvlcArgs = {""};
     private final String[] standardMediaOptions = {""};
-    private final String[] deinterlacers = {"bob","linear"};
+    private final static String[] deinterlacers = {"bob","linear"};
     private final float initialCanvasFactor = 0.5f;
+	private boolean singleVideoMode; //commands will only affect the last added video
+	private Video lastAddedVideo;
 	
 	//called at plugin start to setup library
@@ -69,4 +71,5 @@
 			mp.setStandardMediaOptions(standardMediaOptions);
 			videos.add(video);
+			lastAddedVideo=video;
 			mp.setVideoSurface(video.canvas);
 	        mp.addMediaPlayerEventListener(this);
@@ -97,25 +100,57 @@
 	}
 
-	public void play()
-	{
-		for (Video video : videos) {
-			video.player.play();
+	public void play()	
+	{
+		if (singleVideoMode)
+		{
+			lastAddedVideo.player.play();
+		}
+		else
+		{
+			for (Video video : videos) {
+				video.player.play();
+			}
 		}
 		System.out.println("abspielen");
 	}
 	
+	//toggles pause and play 
 	public void pause()
 	{
-		for (Video video : videos) {
-			video.player.pause();
-		}
-	}
-	
+		if (singleVideoMode)
+		{
+			lastAddedVideo.player.pause();
+		}
+		else
+		{
+			for (Video video : videos) {
+				video.player.pause();
+			}
+		}
+	}
+	
+	//ensures that all stop
+	public void pauseAll() {
+		for (Video video : videos) {
+			if (video.player.isPlaying())
+				video.player.pause();
+		}	
+	}
+
 	//jumps relative for ms in all videos
-	public void jump(long ms) {
-		for (Video video : videos) {
-			long start=video.player.getTime();
-			video.player.setTime(start+ms);
-		}
+	public void jumpFor(long ms) {
+		if (singleVideoMode)
+		{
+			long start=lastAddedVideo.player.getTime();
+			lastAddedVideo.player.setTime(start+ms);
+		}
+		else
+		{
+			for (Video video : videos) {
+				long start=video.player.getTime();
+				video.player.setTime(start+ms);
+			}
+		}
+		notifyObservers(VideoObserversEvents.jumping);
 		
 	}
@@ -124,11 +159,18 @@
 	public void jumpTo(long msVideo)
 	{
-		for (Video video : videos) {
-			video.player.setTime(msVideo);
+		if (singleVideoMode)
+		{
+			lastAddedVideo.player.setTime(msVideo);
+		}
+		else
+		{
+			for (Video video : videos) {
+				video.player.setTime(msVideo);
+			}
 		}
 		notifyObservers(VideoObserversEvents.jumping);
 	}
 			
-	//TODO muss auf Rückgabe für alle Videos erweitert werden
+	//TODO muss evtl. auf Rückgabe für alle Videos erweitert werden
 	public long getVideoTime()
 	{
@@ -139,11 +181,19 @@
 	public void jumpToPosition(int percent)
 	{
-		for (Video video : videos) {
-			float position = ((float)percent/100f);
-			video.player.setPosition(position);
+		float position = ((float)percent/100f);
+		if (singleVideoMode)
+		{
+			lastAddedVideo.player.setPosition(position);
+		}
+		else
+		{
+			for (Video video : videos) {
+				video.player.setPosition(position);
+			}
 		}
 		notifyObservers(VideoObserversEvents.jumping);
 	}
 	
+	//TODO has to be for every video
 	public int getPosition()
 	{
@@ -155,4 +205,8 @@
 	public void setSpeed(int percent)
 	{
+		if (singleVideoMode)
+		{
+			lastAddedVideo.player.setRate((float)(percent/100f));
+		}
 		for (Video video : videos) {
 			video.player.setRate((float)(percent/100f));
@@ -196,10 +250,17 @@
 	public void setDeinterlacer (String deinterlacer)
 	{
-		for (Video video : videos) {
-			video.player.setDeinterlace(deinterlacer);
-		}
-	}
-	
-	public String[] getDeinterlacers()
+		if (singleVideoMode)
+		{
+			lastAddedVideo.player.setDeinterlace(deinterlacer);
+		}
+		else
+		{
+			for (Video video : videos) {
+				video.player.setDeinterlace(deinterlacer);
+			}
+		}
+	}
+	
+	public static String[] getDeinterlacers()
 	{
 		return deinterlacers;
@@ -208,4 +269,8 @@
 	public void mute()
 	{
+		if (singleVideoMode)
+		{
+			lastAddedVideo.player.mute();
+		}
 		for (Video video : videos) {
 			video.player.mute();
@@ -310,3 +375,16 @@
 	}
 
+	public boolean isNoVideoPlaying() {
+		for (Video video : videos) {
+			if (video.player.isPlaying())
+				return false;
+		}
+		return true;
+	}
+
+	public void enableSingleVideoMode(boolean enabled) {
+		singleVideoMode = true;
+		
+	}
+
 }
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java	(revision 25894)
@@ -94,7 +94,7 @@
 	}
 	
-	public Video addVideo(File Videofile)
-	{
-		Video video = new Video(Videofile);		
+	public Video addVideo(File Videofile,String id)
+	{
+		Video video = new Video(Videofile,id);		
 		canvasPanel.add(video.panel);
 		video.canvas.setSize(new Dimension(300, 300)); // will be updated by the video engine itself
@@ -112,22 +112,23 @@
 	
 	public void pause(){
-		if (notificationTimer!=null)
-		{
-			notificationTimer.cancel();
-			notificationTimer=null;
-		}
+		videoengine.pause();
+		if (videoengine.isNoVideoPlaying())
+			stopNotificationTimer();
 		else
-		{
 			startNotificationTimer();
-		}
-		videoengine.pause();
+	}
+	
+	public void pauseAll()
+	{
+		stopNotificationTimer();
+		videoengine.pauseAll();
 	}
 
 	public void backward() {
-		videoengine.jump(-jumpLength);	
+		videoengine.jumpFor(-jumpLength);	
 	}
 
 	public void forward() {
-		videoengine.jump(jumpLength);	
+		videoengine.jumpFor(jumpLength);	
 	}
 
@@ -157,4 +158,5 @@
 	}
 
+	//TODO auf mehrere Videos umstellen
 	public void toggleLooping() {
 		if(loopingTimer==null)
@@ -299,4 +301,10 @@
     }
     
+    public void enableSingleVideoMode(boolean enabled)
+    {
+    	pauseAll();
+    	videoengine.enableSingleVideoMode(enabled);
+    }
+    
     public void addObserver(VideoPlayerObserver observer)
     {
@@ -305,16 +313,23 @@
 	
 	
+	private void stopNotificationTimer() {
+		/*
+		if(notificationTimer!=null)
+		{
+			notificationTimer.cancel();
+			notificationTimer=null;
+		}
+		*/
+	}
+
 	private void startNotificationTimer() {
-		if(notificationTimer==null)
-		{
-			notificationTimer= new Timer();
-		    notificationTimer.schedule(new TimerTask() {				
-				@Override
-				public void run() {
-					notifyObservers();
-					
-				}
-			},notificationIntervall,notificationIntervall);
-		}
+		notificationTimer= new Timer();
+		notificationTimer.schedule(new TimerTask() {				
+			@Override
+			public void run() {
+				notifyObservers();
+				
+			}
+		},notificationIntervall,notificationIntervall);
 	}
 	
@@ -369,7 +384,9 @@
 			{
 				speed.setValue(videoengine.getSpeed());
+				break;
 			}
 			case jumping:
-			{				
+			{			
+				break;
 			}
 		}		
Index: /applications/editors/josm/plugins/videomapping/test/videotest.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/test/videotest.java	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/test/videotest.java	(revision 25894)
@@ -28,6 +28,7 @@
     	testplayer.setJumpLength(1000);
     	testplayer.setLoopLength(3000);
-    	testplayer.addVideo(new File("C:\\TEMP\\test.mpg"));
-    	testplayer.addVideo(new File("C:\\TEMP\\aoe-drachen_dvdscr.avi"));
+    	testplayer.addVideo(new File("C:\\TEMP\\test.mpg"),"1");
+    	testplayer.addVideo(new File("C:\\TEMP\\aoe-drachen_dvdscr.avi"),"2");
+    	testplayer.enableSingleVideoMode(true);
         
     }
Index: /applications/editors/josm/plugins/videomapping/uml/oldConcept.uml
===================================================================
--- /applications/editors/josm/plugins/videomapping/uml/oldConcept.uml	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/uml/oldConcept.uml	(revision 25894)
@@ -155,20 +155,4 @@
   </packagedElement>
   <packagedElement xmi:type="uml:Class" xmi:id="_oS42MGeAEeC5DqwlMjG_Kw" name="SimpleVideoPlayer" clientDependency="_ur80kGeBEeC5DqwlMjG_Kw">
-    <ownedOperation xmi:id="_rVC_oGeAEeC5DqwlMjG_Kw" name="finished">
-      <ownedParameter xmi:id="_yLSesGeAEeC5DqwlMjG_Kw" direction="return"/>
-      <ownedParameter xmi:id="_yLSesWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_sZ5H0GeAEeC5DqwlMjG_Kw" name="metaDataAvailable">
-      <ownedParameter xmi:id="_zsvqYGeAEeC5DqwlMjG_Kw" direction="return"/>
-      <ownedParameter xmi:id="_zsvqYWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_uO3FYGeAEeC5DqwlMjG_Kw" name="paused">
-      <ownedParameter xmi:id="_1QR5sGeAEeC5DqwlMjG_Kw" direction="return"/>
-      <ownedParameter xmi:id="_1QR5sWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_vaRIkGeAEeC5DqwlMjG_Kw" name="playing">
-      <ownedParameter xmi:id="_14z5UGeAEeC5DqwlMjG_Kw" direction="return"/>
-      <ownedParameter xmi:id="_14z5UWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
-    </ownedOperation>
     <ownedOperation xmi:id="_6mkB4GeAEeC5DqwlMjG_Kw" name="updateTime" visibility="private">
       <ownedParameter xmi:id="_7l5X8GeAEeC5DqwlMjG_Kw" direction="return"/>
@@ -210,3 +194,23 @@
   <packagedElement xmi:type="uml:Dependency" xmi:id="_ur80kGeBEeC5DqwlMjG_Kw" supplier="_TLhlcGeBEeC5DqwlMjG_Kw" client="_oS42MGeAEeC5DqwlMjG_Kw"/>
   <packagedElement xmi:type="uml:Dependency" xmi:id="_yaOdIGeBEeC5DqwlMjG_Kw" supplier="_TLhlcGeBEeC5DqwlMjG_Kw" client="_DID-UGeAEeC5DqwlMjG_Kw"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_i61f8GwAEeCIG-Xw7oAxcQ" name="vlcj.player.MediaPlayerEventListener" clientDependency="_vJvs0GwAEeCIG-Xw7oAxcQ">
+    <ownedOperation xmi:id="_qi2aMGwAEeCIG-Xw7oAxcQ" name="operation"/>
+    <ownedOperation xmi:id="_rVC_oGeAEeC5DqwlMjG_Kw" name="finished">
+      <ownedParameter xmi:id="_yLSesGeAEeC5DqwlMjG_Kw" direction="return"/>
+      <ownedParameter xmi:id="_yLSesWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_sZ5H0GeAEeC5DqwlMjG_Kw" name="metaDataAvailable">
+      <ownedParameter xmi:id="_zsvqYGeAEeC5DqwlMjG_Kw" direction="return"/>
+      <ownedParameter xmi:id="_zsvqYWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_uO3FYGeAEeC5DqwlMjG_Kw" name="paused">
+      <ownedParameter xmi:id="_1QR5sGeAEeC5DqwlMjG_Kw" direction="return"/>
+      <ownedParameter xmi:id="_1QR5sWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_vaRIkGeAEeC5DqwlMjG_Kw" name="playing">
+      <ownedParameter xmi:id="_14z5UGeAEeC5DqwlMjG_Kw" direction="return"/>
+      <ownedParameter xmi:id="_14z5UWeAEeC5DqwlMjG_Kw" name="MediaPlayer"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Realization" xmi:id="_vJvs0GwAEeCIG-Xw7oAxcQ" supplier="_oS42MGeAEeC5DqwlMjG_Kw" client="_i61f8GwAEeCIG-Xw7oAxcQ"/>
 </uml:Package>
Index: /applications/editors/josm/plugins/videomapping/uml/oldConcept.umlclass
===================================================================
--- /applications/editors/josm/plugins/videomapping/uml/oldConcept.umlclass	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/uml/oldConcept.umlclass	(revision 25894)
@@ -383,20 +383,4 @@
     </children>
     <children xmi:type="notation:BasicCompartment" xmi:id="_oTU7GmeAEeC5DqwlMjG_Kw" type="7002">
-      <children xmi:type="notation:Node" xmi:id="_rVV6kGeAEeC5DqwlMjG_Kw" type="3002">
-        <element xmi:type="uml:Operation" href="oldConcept.uml#_rVC_oGeAEeC5DqwlMjG_Kw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rVV6kWeAEeC5DqwlMjG_Kw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_saMCwGeAEeC5DqwlMjG_Kw" type="3002">
-        <element xmi:type="uml:Operation" href="oldConcept.uml#_sZ5H0GeAEeC5DqwlMjG_Kw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_saMCwWeAEeC5DqwlMjG_Kw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_uPA2YGeAEeC5DqwlMjG_Kw" type="3002">
-        <element xmi:type="uml:Operation" href="oldConcept.uml#_uO3FYGeAEeC5DqwlMjG_Kw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_uPA2YWeAEeC5DqwlMjG_Kw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_vaaSgGeAEeC5DqwlMjG_Kw" type="3002">
-        <element xmi:type="uml:Operation" href="oldConcept.uml#_vaRIkGeAEeC5DqwlMjG_Kw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vaaSgWeAEeC5DqwlMjG_Kw"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="_6m280GeAEeC5DqwlMjG_Kw" type="3002">
         <element xmi:type="uml:Operation" href="oldConcept.uml#_6mkB4GeAEeC5DqwlMjG_Kw"/>
@@ -480,4 +464,48 @@
     <element xmi:type="uml:Class" href="oldConcept.uml#_TLhlcGeBEeC5DqwlMjG_Kw"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLrWcmeBEeC5DqwlMjG_Kw" x="945" y="575"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_i7SL4GwAEeCIG-Xw7oAxcQ" type="2013" fontName="Calibri">
+    <children xmi:type="notation:DecorationNode" xmi:id="_i7SL4mwAEeCIG-Xw7oAxcQ" type="5018"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_i7SL42wAEeCIG-Xw7oAxcQ" type="5035"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i7SL5GwAEeCIG-Xw7oAxcQ" type="7029">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i7SL5WwAEeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i7SL5mwAEeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i7SL52wAEeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_i7SL6GwAEeCIG-Xw7oAxcQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i7SL6WwAEeCIG-Xw7oAxcQ" type="7030">
+      <children xmi:type="notation:Node" xmi:id="_qjJVIGwAEeCIG-Xw7oAxcQ" type="3029">
+        <element xmi:type="uml:Operation" href="oldConcept.uml#_qi2aMGwAEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qjJVIWwAEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_rVV6kGeAEeC5DqwlMjG_Kw" type="3029">
+        <element xmi:type="uml:Operation" href="oldConcept.uml#_rVC_oGeAEeC5DqwlMjG_Kw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rVV6kWeAEeC5DqwlMjG_Kw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_saMCwGeAEeC5DqwlMjG_Kw" type="3029">
+        <element xmi:type="uml:Operation" href="oldConcept.uml#_sZ5H0GeAEeC5DqwlMjG_Kw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_saMCwWeAEeC5DqwlMjG_Kw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_uPA2YGeAEeC5DqwlMjG_Kw" type="3029">
+        <element xmi:type="uml:Operation" href="oldConcept.uml#_uO3FYGeAEeC5DqwlMjG_Kw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uPA2YWeAEeC5DqwlMjG_Kw"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_vaaSgGeAEeC5DqwlMjG_Kw" type="3029">
+        <element xmi:type="uml:Operation" href="oldConcept.uml#_vaRIkGeAEeC5DqwlMjG_Kw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vaaSgWeAEeC5DqwlMjG_Kw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i7SL6mwAEeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i7SL62wAEeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i7SL7GwAEeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_i7SL7WwAEeCIG-Xw7oAxcQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_i7SL7mwAEeCIG-Xw7oAxcQ" type="7031">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_i7SL72wAEeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_i7SL8GwAEeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_i7SL8WwAEeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_i7SL8mwAEeCIG-Xw7oAxcQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="oldConcept.uml#_i61f8GwAEeCIG-Xw7oAxcQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i7SL4WwAEeCIG-Xw7oAxcQ" x="835" y="20"/>
   </children>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_j2NhcWd-EeC5DqwlMjG_Kw"/>
@@ -602,3 +630,17 @@
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yaOdJGeBEeC5DqwlMjG_Kw" points="[58, -25, -315, 136]$[323, -132, -50, 29]"/>
   </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_vJ42wGwAEeCIG-Xw7oAxcQ" type="4010" source="_i7SL4GwAEeCIG-Xw7oAxcQ" target="_oTU7EGeAEeC5DqwlMjG_Kw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_vJ42xGwAEeCIG-Xw7oAxcQ" type="6011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vJ42xWwAEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vJ42xmwAEeCIG-Xw7oAxcQ" type="6021">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vJ42x2wAEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_vJ42wWwAEeCIG-Xw7oAxcQ"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_vJ42wmwAEeCIG-Xw7oAxcQ" fontName="Calibri"/>
+    <element xmi:type="uml:Realization" href="oldConcept.uml#_vJvs0GwAEeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vJ42w2wAEeCIG-Xw7oAxcQ" points="[0, 0, -8, -109]$[9, 57, 1, -52]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vKCnwGwAEeCIG-Xw7oAxcQ" id="(0.6375545851528385,1.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vKCnwWwAEeCIG-Xw7oAxcQ" id="(0.36619718309859156,0.0)"/>
+  </edges>
 </notation:Diagram>
Index: /applications/editors/josm/plugins/videomapping/uml/refactoring.uml
===================================================================
--- /applications/editors/josm/plugins/videomapping/uml/refactoring.uml	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/uml/refactoring.uml	(revision 25894)
@@ -19,39 +19,72 @@
       <ownedParameter xmi:id="_64YOYFRrEeCQNNgUSH7L8A" direction="return"/>
     </ownedOperation>
-    <ownedOperation xmi:id="_8bUn0FRrEeCQNNgUSH7L8A" name="createMenusAndShortCuts">
-      <ownedParameter xmi:id="_3MD6kFSgEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_-VgckFRrEeCQNNgUSH7L8A" name="importVideoFile">
-      <ownedParameter xmi:id="_AwB-QFRsEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_BQ9hEFRsEeCQNNgUSH7L8A" name="loadSettings">
-      <ownedParameter xmi:id="_CVW9UFRsEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_CnPXgFRsEeCQNNgUSH7L8A" name="saveSettings">
-      <ownedParameter xmi:id="_E7zbIFRsEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_FPB5IFRsEeCQNNgUSH7L8A" name="setDefaults">
-      <ownedParameter xmi:id="_pmckUF0CEeCEEfnO4j572A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_7wH7oFSgEeCQNNgUSH7L8A" name="enableControlMenus">
-      <ownedParameter xmi:id="_9Gi8AFSgEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_DuoqUFShEeCQNNgUSH7L8A" name="applySettings">
-      <ownedParameter xmi:id="_EdbC8FShEeCQNNgUSH7L8A" direction="return"/>
+    <ownedOperation xmi:id="_8bUn0FRrEeCQNNgUSH7L8A" name="createMenusAndShortCuts" visibility="private">
+      <ownedParameter xmi:id="_mEX6MGv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_-VgckFRrEeCQNNgUSH7L8A" name="importVideoFile" visibility="private">
+      <ownedParameter xmi:id="_nObSgGv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_BQ9hEFRsEeCQNNgUSH7L8A" name="loadProperties" visibility="private">
+      <ownedParameter xmi:id="_FJ0vQGv1EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_CnPXgFRsEeCQNNgUSH7L8A" name="saveProperties" visibility="private">
+      <ownedParameter xmi:id="_Dzi40Gv1EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_FPB5IFRsEeCQNNgUSH7L8A" name="setDefaults" visibility="private">
+      <ownedParameter xmi:id="_oM3QsGv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_7wH7oFSgEeCQNNgUSH7L8A" name="enableControlMenus" visibility="private">
+      <ownedParameter xmi:id="_pCgfQGv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_DuoqUFShEeCQNNgUSH7L8A" name="applySettings" visibility="private">
+      <ownedParameter xmi:id="_qIsrQGv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_uF3EYGv0EeCIG-Xw7oAxcQ" name="activeLayerChange">
+      <ownedParameter xmi:id="_vazeEGv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_vkMDkGv0EeCIG-Xw7oAxcQ" name="layerAdded">
+      <ownedParameter xmi:id="_wmf1IGv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_xOb-4Gv0EeCIG-Xw7oAxcQ" name="layerRemoved">
+      <ownedParameter xmi:id="_yOEP4Gv0EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_pBWMMGv1EeCIG-Xw7oAxcQ" name="showJumpTo" visibility="private">
+      <ownedParameter xmi:id="_p1NSEGv1EeCIG-Xw7oAxcQ" direction="return"/>
     </ownedOperation>
   </packagedElement>
   <packagedElement xmi:type="uml:Class" xmi:id="_PlPfAFRsEeCQNNgUSH7L8A" name="GPSVideo">
     <generalization xmi:id="_Chj2IFomEeClo8qtmvnTtw" general="_n4H5YFolEeClo8qtmvnTtw"/>
-    <ownedAttribute xmi:id="_S4Pg0FRsEeCQNNgUSH7L8A" name="synced" aggregation="composite"/>
-    <ownedAttribute xmi:id="_UmDtgFRsEeCQNNgUSH7L8A" name="syncWP" aggregation="composite"/>
+    <ownedAttribute xmi:id="_S4Pg0FRsEeCQNNgUSH7L8A" name="syncComponent" aggregation="composite"/>
+    <ownedAttribute xmi:id="_UmDtgFRsEeCQNNgUSH7L8A" name="syncWayPoint" aggregation="composite"/>
     <ownedAttribute xmi:id="_WVXvAFRsEeCQNNgUSH7L8A" name="syncVideoTime" aggregation="composite"/>
-    <ownedOperation xmi:id="_2-2GIFRtEeCQNNgUSH7L8A" name="calcCoverage">
-      <ownedParameter xmi:id="_4cRtcFRtEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_4shI4FRtEeCQNNgUSH7L8A" name="getFirstWP">
-      <ownedParameter xmi:id="_55jjwFRtEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_6BAPkFRtEeCQNNgUSH7L8A" name="getLastWP">
-      <ownedParameter xmi:id="_8Ebf4FRtEeCQNNgUSH7L8A" direction="return"/>
+    <ownedAttribute xmi:id="_efVz8GwfEeCIG-Xw7oAxcQ" name="start" aggregation="composite"/>
+    <ownedAttribute xmi:id="_e3B7MGwfEeCIG-Xw7oAxcQ" name="end" aggregation="composite"/>
+    <ownedAttribute xmi:id="_fZTh0GwfEeCIG-Xw7oAxcQ" name="firstWayPoint" aggregation="composite"/>
+    <ownedAttribute xmi:id="_gI_SUGwfEeCIG-Xw7oAxcQ" name="lastWayPoint" aggregation="composite"/>
+    <ownedAttribute xmi:id="_hrME4GwfEeCIG-Xw7oAxcQ" name="videoPositionLayer" aggregation="composite"/>
+    <ownedOperation xmi:id="_2-2GIFRtEeCQNNgUSH7L8A" name="doSync">
+      <ownedParameter xmi:id="_kXcPwGwfEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_4shI4FRtEeCQNNgUSH7L8A" name="getFirstGPS">
+      <ownedParameter xmi:id="_mLhcgGwfEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_6BAPkFRtEeCQNNgUSH7L8A" name="getLastGPS">
+      <ownedParameter xmi:id="_nBA6EGwfEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_nhzS8GwfEeCIG-Xw7oAxcQ" name="removeSyncedWayPoints">
+      <ownedParameter xmi:id="_odjwkGwfEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_okjwcGwfEeCIG-Xw7oAxcQ" name="markSyncedWayPoints">
+      <ownedParameter xmi:id="_rC9FgGwfEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_sS0x8GwfEeCIG-Xw7oAxcQ" name="isSynced">
+      <ownedParameter xmi:id="_s7D2oGwfEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_tL5vAGwfEeCIG-Xw7oAxcQ" name="jumpTo">
+      <ownedParameter xmi:id="_uRyZAGwfEeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_uRyZAWwfEeCIG-Xw7oAxcQ" name="Date"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_ugY1sGwfEeCIG-Xw7oAxcQ" name="getCurrentWayPoint">
+      <ownedParameter xmi:id="_vwQiIGwfEeCIG-Xw7oAxcQ" direction="return"/>
     </ownedOperation>
   </packagedElement>
@@ -62,9 +95,12 @@
     <ownedOperation xmi:id="_Q_fIEFRvEeCQNNgUSH7L8A" name="operation3"/>
   </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_Zzy2UFRvEeCQNNgUSH7L8A" name="VideoPlayer" clientDependency="_OyCWkFqlEeC9SaX6k5fY1Q _VjNvcFqlEeC9SaX6k5fY1Q">
-    <ownedAttribute xmi:id="_2wMrsFSlEeCQNNgUSH7L8A" name="logger" aggregation="composite"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_Zzy2UFRvEeCQNNgUSH7L8A" name="VideoPlayer" clientDependency="_OyCWkFqlEeC9SaX6k5fY1Q _VjNvcFqlEeC9SaX6k5fY1Q _oXWwAGwhEeCIG-Xw7oAxcQ">
     <ownedAttribute xmi:id="_oQVTYFSmEeCQNNgUSH7L8A" name="screenPanel" aggregation="composite"/>
     <ownedAttribute xmi:id="_pLfUEFSmEeCQNNgUSH7L8A" name="controlsPanel" aggregation="composite"/>
     <ownedAttribute xmi:id="_J0hIEFtzEeCcNedtTKlFGg" name="jumpLength" aggregation="composite"/>
+    <ownedAttribute xmi:id="_LJbuAGwFEeCIG-Xw7oAxcQ" name="loopLength" aggregation="composite"/>
+    <ownedAttribute xmi:id="_MOR2MGwFEeCIG-Xw7oAxcQ" name="videoEngine" aggregation="composite"/>
+    <ownedAttribute xmi:id="_M_J5gGwFEeCIG-Xw7oAxcQ" name="observers" aggregation="composite"/>
+    <ownedAttribute xmi:id="_RKLvgGwFEeCIG-Xw7oAxcQ" name="notificationTimer" aggregation="composite"/>
     <ownedOperation xmi:id="_nSHcoFRvEeCQNNgUSH7L8A" name="loop">
       <ownedParameter xmi:id="_n-OUsFRvEeCQNNgUSH7L8A" direction="return"/>
@@ -76,20 +112,53 @@
       <ownedParameter xmi:id="_O2fT4FRyEeCQNNgUSH7L8A" direction="return"/>
     </ownedOperation>
-    <ownedOperation xmi:id="_jVP-cFRvEeCQNNgUSH7L8A" name="jumpForward">
-      <ownedParameter xmi:id="_kQQOIFRvEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_kYdH4FRvEeCQNNgUSH7L8A" name="jumpBackward">
-      <ownedParameter xmi:id="_lK-J8FRvEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_4MAgAFRxEeCQNNgUSH7L8A" name="VideoPositionLayer" clientDependency="_xv7skF0FEeCEEfnO4j572A">
-    <ownedAttribute xmi:id="_TfBWsFSdEeCQNNgUSH7L8A" name="iconPosition" aggregation="composite"/>
-    <ownedAttribute xmi:id="_HIPx0FSeEeCQNNgUSH7L8A" name="isDragging" aggregation="composite"/>
-    <ownedAttribute xmi:id="_K5o_0FSeEeCQNNgUSH7L8A" name="mousePosition" aggregation="composite"/>
-    <ownedOperation xmi:id="_5kYBIFRxEeCQNNgUSH7L8A" name="registerContextMenu">
-      <ownedParameter xmi:id="__hPoMFRxEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="__rhlkFRxEeCQNNgUSH7L8A" name="drawCoverage">
-      <ownedParameter xmi:id="_BGH7UFRyEeCQNNgUSH7L8A" direction="return"/>
+    <ownedOperation xmi:id="_jVP-cFRvEeCQNNgUSH7L8A" name="Forward">
+      <ownedParameter xmi:id="_Tjg-YGwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_kYdH4FRvEeCQNNgUSH7L8A" name="Backward">
+      <ownedParameter xmi:id="_UJNscGwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_WoNecGwFEeCIG-Xw7oAxcQ" name="setSpeed">
+      <ownedParameter xmi:id="_XTkvoGwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_Xa3qcGwFEeCIG-Xw7oAxcQ" name="setDeinterlacer">
+      <ownedParameter xmi:id="_YEcy8GwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_YPoIMGwFEeCIG-Xw7oAxcQ" name="setSubtitles">
+      <ownedParameter xmi:id="_ZeJw0GwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_Zl5XkGwFEeCIG-Xw7oAxcQ" name="mute">
+      <ownedParameter xmi:id="_aTy_YGwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_aZdigGwFEeCIG-Xw7oAxcQ" name="toggleLooping">
+      <ownedParameter xmi:id="_b1_x8GwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_b8jF4GwFEeCIG-Xw7oAxcQ" name="addUI">
+      <ownedParameter xmi:id="_hmfw8GwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_c_nFYGwFEeCIG-Xw7oAxcQ" name="addUIListeners">
+      <ownedParameter xmi:id="_lQc6MGwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_lW3EMGwFEeCIG-Xw7oAxcQ" name="enableSingleVideoMode">
+      <ownedParameter xmi:id="_m20bEGwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_m87qIGwFEeCIG-Xw7oAxcQ" name="startNoticicationTimer">
+      <ownedParameter xmi:id="_oU14QGwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_oaDvcGwFEeCIG-Xw7oAxcQ" name="stopNotificationTimer">
+      <ownedParameter xmi:id="_pW2u4GwFEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_qZnMYGwFEeCIG-Xw7oAxcQ" name="operation"/>
+    <ownedOperation xmi:id="_rDMU4GwFEeCIG-Xw7oAxcQ" name="update">
+      <ownedParameter xmi:id="_tIZt4GwFEeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_tIZt4WwFEeCIG-Xw7oAxcQ" name="VideoObserverEvent"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_4MAgAFRxEeCQNNgUSH7L8A" name="VideoPositionLayer" clientDependency="_nbAcgGwhEeCIG-Xw7oAxcQ">
+    <ownedAttribute xmi:id="_TfBWsFSdEeCQNNgUSH7L8A" name="iconPosition" visibility="private" aggregation="composite"/>
+    <ownedAttribute xmi:id="_K5o_0FSeEeCQNNgUSH7L8A" name="mousePosition" visibility="private" aggregation="composite"/>
+    <ownedAttribute xmi:id="_SxVmcGv4EeCIG-Xw7oAxcQ" name="gpsTrack" visibility="private" aggregation="composite"/>
+    <ownedAttribute xmi:id="_TxteUGv4EeCIG-Xw7oAxcQ" name="gpsVideoPlayer" visibility="private" aggregation="composite"/>
+    <ownedOperation xmi:id="__rhlkFRxEeCQNNgUSH7L8A" name="drawCoverage" visibility="private">
+      <ownedParameter xmi:id="_2BhWkGv4EeCIG-Xw7oAxcQ" direction="return"/>
     </ownedOperation>
     <ownedOperation xmi:id="_CdAOsFRyEeCQNNgUSH7L8A" name="jumpToGPSTime">
@@ -101,4 +170,29 @@
     <ownedOperation xmi:id="_K1jcwFRsEeCQNNgUSH7L8A" name="showInfoWindow">
       <ownedParameter xmi:id="_NGF8AFRsEeCQNNgUSH7L8A" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_ldm4UGv4EeCIG-Xw7oAxcQ" name="getLeftPoint" visibility="private">
+      <ownedParameter xmi:id="_nLR7EGv4EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_nUgvkGv4EeCIG-Xw7oAxcQ" name="getRightPoint" visibility="private">
+      <ownedParameter xmi:id="_oQHcMGv4EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_oblsYGv4EeCIG-Xw7oAxcQ" name="getGPSDate">
+      <ownedParameter xmi:id="_p2yfEGv4EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_qnqiYGv4EeCIG-Xw7oAxcQ" name="getTrack">
+      <ownedParameter xmi:id="_sWFMAGv4EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_t0QaMGv4EeCIG-Xw7oAxcQ" name="jump">
+      <ownedParameter xmi:id="_vjkbsGv4EeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_vjkbsWv4EeCIG-Xw7oAxcQ" name="Date"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_wUJkEGv4EeCIG-Xw7oAxcQ" name="setIconPosition">
+      <ownedParameter xmi:id="_xxRpYGv4EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_yA7O8Gv4EeCIG-Xw7oAxcQ" name="setAutoCenter">
+      <ownedParameter xmi:id="_y_qIEGv4EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_2oHcgGv4EeCIG-Xw7oAxcQ" name="paint">
+      <ownedParameter xmi:id="_2-eHAGv4EeCIG-Xw7oAxcQ" direction="return"/>
     </ownedOperation>
   </packagedElement>
@@ -106,29 +200,34 @@
     <generalization xmi:id="_8RbsAFlNEeCTIL9CCJRwPw" general="_Zzy2UFRvEeCQNNgUSH7L8A"/>
     <ownedAttribute xmi:id="_YOwV0FVZEeCOu_gAbBroWQ" name="videos" aggregation="composite"/>
-    <ownedAttribute xmi:id="_lBTl0FVaEeCOu_gAbBroWQ" name="syncPanel" aggregation="composite"/>
-    <ownedOperation xmi:id="_PA6bMFRyEeCQNNgUSH7L8A" name="extendUI">
-      <ownedParameter xmi:id="_KF0CkFqmEeC9SaX6k5fY1Q" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_QynCUFRyEeCQNNgUSH7L8A" name="addSyncPoint">
-      <ownedParameter xmi:id="_S6XZAFRyEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_TdYmgFRyEeCQNNgUSH7L8A" name="allVideosSynced">
-      <ownedParameter xmi:id="_VyPlEFRyEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_V6St0FRyEeCQNNgUSH7L8A" name="removeFile">
-      <ownedParameter xmi:id="_HY1uIFomEeClo8qtmvnTtw" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_YO2xcFRyEeCQNNgUSH7L8A" name="setAutoCenter">
-      <ownedParameter xmi:id="_Y_u0wFRyEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
-    <ownedOperation xmi:id="_oFrnkFRvEeCQNNgUSH7L8A" name="jumpToSynced">
-      <ownedParameter xmi:id="_pXChwFRvEeCQNNgUSH7L8A" direction="return"/>
+    <ownedAttribute xmi:id="_KXjIoGwGEeCIG-Xw7oAxcQ" name="videoPositionLayer" aggregation="composite"/>
+    <ownedOperation xmi:id="_BloAAGwGEeCIG-Xw7oAxcQ" name="addVideo">
+      <ownedParameter xmi:id="_DgtMoGwGEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_DnHWoGwGEeCIG-Xw7oAxcQ" name="resync" visibility="private">
+      <ownedParameter xmi:id="_Ecm0MGwGEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_EiHmUGwGEeCIG-Xw7oAxcQ" name="findVideo" visibility="private">
+      <ownedParameter xmi:id="_FbyZQGwGEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_F9xE8GwGEeCIG-Xw7oAxcQ" name="areAllVideosSynced" visibility="private">
+      <ownedParameter xmi:id="_HUfAQGwGEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_IahbQGwGEeCIG-Xw7oAxcQ" name="extendUI">
+      <ownedParameter xmi:id="_Ji8b4GwGEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_AMKecGwhEeCIG-Xw7oAxcQ" name="jumpTo">
+      <ownedParameter xmi:id="_BIXA8GwhEeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_BIXA8WwhEeCIG-Xw7oAxcQ" name="Date"/>
     </ownedOperation>
   </packagedElement>
   <packagedElement xmi:type="uml:Dependency" xmi:id="_JJtsYFlWEeCTIL9CCJRwPw" name="n:1" supplier="_PlPfAFRsEeCQNNgUSH7L8A" client="_MhLCUFRyEeCQNNgUSH7L8A"/>
-  <packagedElement xmi:type="uml:Class" xmi:id="_zSPkMFnhEeClo8qtmvnTtw" name="VideoEngine">
-    <ownedAttribute xmi:id="_SBMnYFVZEeCOu_gAbBroWQ" name="players" aggregation="composite"/>
-    <ownedOperation xmi:id="_8dM34FnhEeClo8qtmvnTtw" name="operation"/>
-    <ownedOperation xmi:id="_b4aZcFRvEeCQNNgUSH7L8A" name="setupMediaPlayer">
+  <packagedElement xmi:type="uml:Class" xmi:id="_zSPkMFnhEeClo8qtmvnTtw" name="VideoEngine" clientDependency="_VYcEYGwgEeCIG-Xw7oAxcQ">
+    <ownedAttribute xmi:id="_SBMnYFVZEeCOu_gAbBroWQ" name="videos" aggregation="composite"/>
+    <ownedAttribute xmi:id="_7aYC4Gv-EeCIG-Xw7oAxcQ" name="mediaPlayerFactory" aggregation="composite"/>
+    <ownedAttribute xmi:id="_8Pa0gGv-EeCIG-Xw7oAxcQ" name="observers" aggregation="composite"/>
+    <ownedAttribute xmi:id="_8yS4EGv-EeCIG-Xw7oAxcQ" name="deinterlacers" isStatic="true" aggregation="composite"/>
+    <ownedAttribute xmi:id="_BlQQwGv_EeCIG-Xw7oAxcQ" name="singleVideoMode" aggregation="composite"/>
+    <ownedAttribute xmi:id="_Cx_wsGv_EeCIG-Xw7oAxcQ" name="lastAddedVideo" aggregation="composite"/>
+    <ownedOperation xmi:id="_b4aZcFRvEeCQNNgUSH7L8A" name="setupMediaPlayer" isStatic="true">
       <ownedParameter xmi:id="_fB4EwFRvEeCQNNgUSH7L8A" direction="return"/>
     </ownedOperation>
@@ -154,9 +253,25 @@
       <ownedParameter xmi:id="_uJ2wgFRvEeCQNNgUSH7L8A" direction="return"/>
     </ownedOperation>
-    <ownedOperation xmi:id="_J3w9AFSnEeCQNNgUSH7L8A" name="metaDataAvailable">
-      <ownedParameter xmi:id="_KdwmAFSnEeCQNNgUSH7L8A" direction="return"/>
-    </ownedOperation>
     <ownedOperation xmi:id="_SLcDYFSnEeCQNNgUSH7L8A" name="mute">
       <ownedParameter xmi:id="_TVWRwFSnEeCQNNgUSH7L8A" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_JqxmYGv_EeCIG-Xw7oAxcQ" name="jumpFor">
+      <ownedParameter xmi:id="_Ki8kgGv_EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_tEo28Gv_EeCIG-Xw7oAxcQ" name="getDeinterlacers">
+      <ownedParameter xmi:id="_totNUGv_EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_tv2-MGv_EeCIG-Xw7oAxcQ" name="addObserver">
+      <ownedParameter xmi:id="_wiOYIGv_EeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_wiOYIWv_EeCIG-Xw7oAxcQ" name="VideoObserver"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_wwrD0Gv_EeCIG-Xw7oAxcQ" name="notifyObserver">
+      <ownedParameter xmi:id="_yBl5IGv_EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_yjtuwGv_EeCIG-Xw7oAxcQ" name="isNoVideoPlaying">
+      <ownedParameter xmi:id="_zd-XkGv_EeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_zmeMQGv_EeCIG-Xw7oAxcQ" name="enableSingleVideoMode">
+      <ownedParameter xmi:id="_0kAykGv_EeCIG-Xw7oAxcQ" direction="return"/>
     </ownedOperation>
   </packagedElement>
@@ -165,8 +280,60 @@
     <ownedAttribute xmi:id="_TrDd0FRsEeCQNNgUSH7L8A" name="filepath" aggregation="composite"/>
     <ownedAttribute xmi:id="_JD1QUFomEeClo8qtmvnTtw" name="player" aggregation="composite"/>
+    <ownedAttribute xmi:id="_IWl7gGwcEeCIG-Xw7oAxcQ" name="canvas" aggregation="composite"/>
+    <ownedOperation xmi:id="_NugbYGwcEeCIG-Xw7oAxcQ" name="getCurrentTime">
+      <ownedParameter xmi:id="_OfYesGwcEeCIG-Xw7oAxcQ" direction="return"/>
+    </ownedOperation>
   </packagedElement>
   <packagedElement xmi:type="uml:Dependency" xmi:id="_OyCWkFqlEeC9SaX6k5fY1Q" supplier="_zSPkMFnhEeClo8qtmvnTtw" client="_Zzy2UFRvEeCQNNgUSH7L8A"/>
   <packagedElement xmi:type="uml:Dependency" xmi:id="_VjNvcFqlEeC9SaX6k5fY1Q" supplier="_n4H5YFolEeClo8qtmvnTtw" client="_Zzy2UFRvEeCQNNgUSH7L8A"/>
-  <packagedElement xmi:type="uml:Interface" xmi:id="_6vSikFxoEeCd3KUH_BuVkA" name="VideoObserver"/>
-  <packagedElement xmi:type="uml:Dependency" xmi:id="_xv7skF0FEeCEEfnO4j572A" supplier="_aDA64FRrEeCQNNgUSH7L8A" client="_4MAgAFRxEeCQNNgUSH7L8A"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_6vSikFxoEeCd3KUH_BuVkA" name="VideoPlayerObserver"/>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_edQX0Gv0EeCIG-Xw7oAxcQ" name="VideoObserver" clientDependency="_FRRzkGwgEeCIG-Xw7oAxcQ">
+    <ownedOperation xmi:id="_OK8i8GwgEeCIG-Xw7oAxcQ" name="update">
+      <ownedParameter xmi:id="_PhEoYGwgEeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_PhEoYWwgEeCIG-Xw7oAxcQ" name="VideoObserverEvents"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interface" xmi:id="_b1EMkGv_EeCIG-Xw7oAxcQ" name="vlcj.player.MediaPlayerEventListener" clientDependency="_jVU5AGv_EeCIG-Xw7oAxcQ">
+    <ownedOperation xmi:id="_Fmn_AGwAEeCIG-Xw7oAxcQ" name="operation"/>
+    <ownedOperation xmi:id="_J3w9AFSnEeCQNNgUSH7L8A" name="metaDataAvailable">
+      <ownedParameter xmi:id="_KdwmAFSnEeCQNNgUSH7L8A" direction="return"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_LNRT4Gv_EeCIG-Xw7oAxcQ" name="paused">
+      <ownedParameter xmi:id="_MoAzkGv_EeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_MoAzkWv_EeCIG-Xw7oAxcQ" name="Mediaplayer"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_Mu3pgGv_EeCIG-Xw7oAxcQ" name="playing">
+      <ownedParameter xmi:id="_QV_hMGv_EeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_QV_hMWv_EeCIG-Xw7oAxcQ" name="Mediaplayer"/>
+    </ownedOperation>
+    <ownedOperation xmi:id="_OCBTcGv_EeCIG-Xw7oAxcQ" name="finished">
+      <ownedParameter xmi:id="_Pw4pAGv_EeCIG-Xw7oAxcQ" direction="return"/>
+      <ownedParameter xmi:id="_Pw4pAWv_EeCIG-Xw7oAxcQ" name="Mediaplyer"/>
+    </ownedOperation>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Realization" xmi:id="_jVU5AGv_EeCIG-Xw7oAxcQ" supplier="_zSPkMFnhEeClo8qtmvnTtw" client="_b1EMkGv_EeCIG-Xw7oAxcQ"/>
+  <packagedElement xmi:type="uml:Realization" xmi:id="_FRRzkGwgEeCIG-Xw7oAxcQ" supplier="_Zzy2UFRvEeCQNNgUSH7L8A" client="_edQX0Gv0EeCIG-Xw7oAxcQ"/>
+  <packagedElement xmi:type="uml:Usage" xmi:id="_VYcEYGwgEeCIG-Xw7oAxcQ" supplier="_edQX0Gv0EeCIG-Xw7oAxcQ" client="_zSPkMFnhEeClo8qtmvnTtw"/>
+  <packagedElement xmi:type="uml:Realization" xmi:id="_nbAcgGwhEeCIG-Xw7oAxcQ" supplier="_6vSikFxoEeCd3KUH_BuVkA" client="_4MAgAFRxEeCQNNgUSH7L8A"/>
+  <packagedElement xmi:type="uml:Usage" xmi:id="_oXWwAGwhEeCIG-Xw7oAxcQ" supplier="_6vSikFxoEeCd3KUH_BuVkA" client="_Zzy2UFRvEeCQNNgUSH7L8A"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_vQIlsGwhEeCIG-Xw7oAxcQ" memberEnd="_vQSWsGwhEeCIG-Xw7oAxcQ _vQSWs2whEeCIG-Xw7oAxcQ">
+    <ownedEnd xmi:id="_vQSWsGwhEeCIG-Xw7oAxcQ" name="src" type="_PlPfAFRsEeCQNNgUSH7L8A" association="_vQIlsGwhEeCIG-Xw7oAxcQ">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vQSWsmwhEeCIG-Xw7oAxcQ" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vQSWsWwhEeCIG-Xw7oAxcQ" value="1"/>
+    </ownedEnd>
+    <ownedEnd xmi:id="_vQSWs2whEeCIG-Xw7oAxcQ" name="dst" type="_4MAgAFRxEeCQNNgUSH7L8A" association="_vQIlsGwhEeCIG-Xw7oAxcQ">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vQSWtWwhEeCIG-Xw7oAxcQ" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vQSWtGwhEeCIG-Xw7oAxcQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Association" xmi:id="_3dsdAGwhEeCIG-Xw7oAxcQ" memberEnd="_3dsdAWwhEeCIG-Xw7oAxcQ _3dsdBGwhEeCIG-Xw7oAxcQ">
+    <ownedEnd xmi:id="_3dsdAWwhEeCIG-Xw7oAxcQ" name="src" type="_aDA64FRrEeCQNNgUSH7L8A" association="_3dsdAGwhEeCIG-Xw7oAxcQ">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3dsdA2whEeCIG-Xw7oAxcQ" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3dsdAmwhEeCIG-Xw7oAxcQ" value="1"/>
+    </ownedEnd>
+    <ownedEnd xmi:id="_3dsdBGwhEeCIG-Xw7oAxcQ" name="dst" type="_4MAgAFRxEeCQNNgUSH7L8A" association="_3dsdAGwhEeCIG-Xw7oAxcQ">
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3dsdBmwhEeCIG-Xw7oAxcQ" value="1"/>
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3dsdBWwhEeCIG-Xw7oAxcQ" value="1"/>
+    </ownedEnd>
+  </packagedElement>
 </uml:Package>
Index: /applications/editors/josm/plugins/videomapping/uml/refactoring.umlclass
===================================================================
--- /applications/editors/josm/plugins/videomapping/uml/refactoring.umlclass	(revision 25893)
+++ /applications/editors/josm/plugins/videomapping/uml/refactoring.umlclass	(revision 25894)
@@ -64,4 +64,20 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_Du7lQVShEeCQNNgUSH7L8A"/>
       </children>
+      <children xmi:type="notation:Node" xmi:id="_uGKmYGv0EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_uF3EYGv0EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uGKmYWv0EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_vke-gGv0EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_vkMDkGv0EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vke-gWv0EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_xPB0wGv0EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_xOb-4Gv0EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xPB0wWv0EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_pBy4IGv1EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_pBWMMGv1EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_pBy4IWv1EeCIG-Xw7oAxcQ"/>
+      </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_aKnXsVRrEeCQNNgUSH7L8A" showTitle="true"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_aKnXslRrEeCQNNgUSH7L8A"/>
@@ -77,5 +93,5 @@
     <styles xmi:type="notation:CanonicalStyle" xmi:id="_aKUcwVRrEeCQNNgUSH7L8A"/>
     <element xmi:type="uml:Class" href="refactoring.uml#_aDA64FRrEeCQNNgUSH7L8A"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aKUcwlRrEeCQNNgUSH7L8A" x="100" y="255"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aKUcwlRrEeCQNNgUSH7L8A" x="10" y="95"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_Plrj4FRsEeCQNNgUSH7L8A" type="2001" fontName="Calibri">
@@ -97,4 +113,24 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_WVqp8VRsEeCQNNgUSH7L8A"/>
       </children>
+      <children xmi:type="notation:Node" xmi:id="_efou4GwfEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_efVz8GwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_efou4WwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_e3LsMGwfEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_e3B7MGwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_e3LsMWwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_fZmcwGwfEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_fZTh0GwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fZmcwWwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_gJSNQGwfEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_gI_SUGwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gJSNQWwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_hrow0GwfEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_hrME4GwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hrow0WwfEeCIG-Xw7oAxcQ"/>
+      </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_Plrj5lRsEeCQNNgUSH7L8A" showTitle="true"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_Plrj51RsEeCQNNgUSH7L8A"/>
@@ -114,4 +150,24 @@
         <element xmi:type="uml:Operation" href="refactoring.uml#_6BAPkFRtEeCQNNgUSH7L8A"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_6BTKgVRtEeCQNNgUSH7L8A"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_niGN4GwfEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_nhzS8GwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_niGN4WwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ok2rYGwfEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_okjwcGwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok2rYWwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_sTIT8GwfEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_sS0x8GwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sTIT8WwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_tMMp8GwfEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_tL5vAGwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tMMp8WwfEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ugimsGwfEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_ugY1sGwfEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ugimsWwfEeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_Plrj61RsEeCQNNgUSH7L8A" showTitle="true"/>
@@ -128,5 +184,5 @@
     <styles xmi:type="notation:CanonicalStyle" xmi:id="_Plrj4VRsEeCQNNgUSH7L8A"/>
     <element xmi:type="uml:Class" href="refactoring.uml#_PlPfAFRsEeCQNNgUSH7L8A"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Plrj4lRsEeCQNNgUSH7L8A" x="465" y="505" width="166"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Plrj4lRsEeCQNNgUSH7L8A" x="525" y="540" width="186"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_Z0FxQFRvEeCQNNgUSH7L8A" type="2001" fontName="Calibri">
@@ -136,8 +192,4 @@
     <children xmi:type="notation:DecorationNode" xmi:id="_Z0FxRFRvEeCQNNgUSH7L8A" type="5019"/>
     <children xmi:type="notation:BasicCompartment" xmi:id="_Z0FxRVRvEeCQNNgUSH7L8A" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_2wfmoFSlEeCQNNgUSH7L8A" type="3001">
-        <element xmi:type="uml:Property" href="refactoring.uml#_2wMrsFSlEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_2wfmoVSlEeCQNNgUSH7L8A"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="_oQoOUFSmEeCQNNgUSH7L8A" type="3001">
         <element xmi:type="uml:Property" href="refactoring.uml#_oQVTYFSmEeCQNNgUSH7L8A"/>
@@ -151,4 +203,20 @@
         <element xmi:type="uml:Property" href="refactoring.uml#_J0hIEFtzEeCcNedtTKlFGg"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_J2KG0VtzEeCcNedtTKlFGg"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_LJuo8GwFEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_LJbuAGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LJuo8WwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_MOkxIGwFEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_MOR2MGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MOkxIWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_M_TDcGwFEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_M_J5gGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_M_TDcWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_RKeqcGwFEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_RKLvgGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RKeqcWwFEeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_Z0FxRlRvEeCQNNgUSH7L8A" showTitle="true"/>
@@ -165,4 +233,64 @@
         <element xmi:type="uml:Operation" href="refactoring.uml#_iJa4IFSpEeCQNNgUSH7L8A"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_iJtzEVSpEeCQNNgUSH7L8A"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_lSoewGv1EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_OVaAEFRyEeCQNNgUSH7L8A"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lSoewWv1EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_lSyPwGv1EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_jVP-cFRvEeCQNNgUSH7L8A"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lSyPwWv1EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_lSyPwmv1EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_kYdH4FRvEeCQNNgUSH7L8A"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lSyPw2v1EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_WogZYGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_WoNecGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WogZYWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_XbLMcGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_Xa3qcGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XbLMcWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_YPxSIGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_YPoIMGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YPxSIWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ZmDIkGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_Zl5XkGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZmDIkWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_aZmscGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_aZdigGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_aZmscWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_b8s24GwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_b8jF4GwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_b8s24WwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_c_wPUGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_c_nFYGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_c_wPUWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_lXJ_IGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_lW3EMGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lXJ_IWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_m9YWEGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_m87qIGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_m9YWEWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_oaXRcGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_oaDvcGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_oaXRcWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_qZ6uYGwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_qZnMYGwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qZ6uYWwFEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_rDfP0GwFEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_rDMU4GwFEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rDfP0WwFEeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_Z0FxS1RvEeCQNNgUSH7L8A" showTitle="true"/>
@@ -179,5 +307,5 @@
     <styles xmi:type="notation:CanonicalStyle" xmi:id="_Z0FxQVRvEeCQNNgUSH7L8A"/>
     <element xmi:type="uml:Class" href="refactoring.uml#_Zzy2UFRvEeCQNNgUSH7L8A"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0FxQlRvEeCQNNgUSH7L8A" x="725" y="290"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0FxQlRvEeCQNNgUSH7L8A" x="755" y="35"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_4MKRAFRxEeCQNNgUSH7L8A" type="2001" fontName="Calibri">
@@ -191,11 +319,15 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_TfeCoVSdEeCQNNgUSH7L8A"/>
       </children>
-      <children xmi:type="notation:Node" xmi:id="_HI1nsFSeEeCQNNgUSH7L8A" type="3001">
-        <element xmi:type="uml:Property" href="refactoring.uml#_HIPx0FSeEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HI1nsVSeEeCQNNgUSH7L8A"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="_K5yw0FSeEeCQNNgUSH7L8A" type="3001">
         <element xmi:type="uml:Property" href="refactoring.uml#_K5o_0FSeEeCQNNgUSH7L8A"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_K5yw0VSeEeCQNNgUSH7L8A"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_SxohYGv4EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_SxVmcGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SxohYWv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_TyT7QGv4EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_TxteUGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TyT7QWv4EeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_4MKRBlRxEeCQNNgUSH7L8A" showTitle="true"/>
@@ -205,8 +337,4 @@
     </children>
     <children xmi:type="notation:BasicCompartment" xmi:id="_4MKRClRxEeCQNNgUSH7L8A" type="7002">
-      <children xmi:type="notation:Node" xmi:id="_5kq8EFRxEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_5kYBIFRxEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5kq8EVRxEeCQNNgUSH7L8A"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="__rrWkFRxEeCQNNgUSH7L8A" type="3002">
         <element xmi:type="uml:Operation" href="refactoring.uml#__rhlkFRxEeCQNNgUSH7L8A"/>
@@ -224,4 +352,36 @@
         <element xmi:type="uml:Operation" href="refactoring.uml#_K1jcwFRsEeCQNNgUSH7L8A"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_K2JSoVRsEeCQNNgUSH7L8A"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ld5zQGv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_ldm4UGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ld5zQWv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_nU0RkGv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_nUgvkGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nU0RkWv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ob5OYGv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_oblsYGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ob5OYWv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_qn9dUGv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_qnqiYGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qn9dUWv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_t0tGIGv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_t0QaMGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_t0tGIWv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_wUmQAGv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_wUJkEGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wUmQAWv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_yBhE0Gv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_yA7O8Gv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_yBhE0Wv4EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_2oaXcGv4EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_2oHcgGv4EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_2oaXcWv4EeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_4MKRC1RxEeCQNNgUSH7L8A" showTitle="true"/>
@@ -238,5 +398,5 @@
     <styles xmi:type="notation:CanonicalStyle" xmi:id="_4MKRAVRxEeCQNNgUSH7L8A"/>
     <element xmi:type="uml:Class" href="refactoring.uml#_4MAgAFRxEeCQNNgUSH7L8A"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4MKRAlRxEeCQNNgUSH7L8A" x="115" y="515"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4MKRAlRxEeCQNNgUSH7L8A" x="300" y="75" width="186"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_MhUzUFRyEeCQNNgUSH7L8A" type="2001" fontName="Calibri">
@@ -250,7 +410,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_YQZUkVVZEeCOu_gAbBroWQ"/>
       </children>
-      <children xmi:type="notation:Node" xmi:id="_lBwRwFVaEeCOu_gAbBroWQ" type="3001">
-        <element xmi:type="uml:Property" href="refactoring.uml#_lBTl0FVaEeCOu_gAbBroWQ"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lBwRwVVaEeCOu_gAbBroWQ"/>
+      <children xmi:type="notation:Node" xmi:id="_KX2DkGwGEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_KXjIoGwGEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KX2DkWwGEeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_MhekUlRyEeCQNNgUSH7L8A" showTitle="true"/>
@@ -260,27 +420,27 @@
     </children>
     <children xmi:type="notation:BasicCompartment" xmi:id="_MhekVlRyEeCQNNgUSH7L8A" type="7002">
-      <children xmi:type="notation:Node" xmi:id="_PBEMMFRyEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_PA6bMFRyEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PBEMMVRyEeCQNNgUSH7L8A"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_QywzUFRyEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_QynCUFRyEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_QywzUVRyEeCQNNgUSH7L8A"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_TdhwcFRyEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_TdYmgFRyEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TdhwcVRyEeCQNNgUSH7L8A"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_V6b3wFRyEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_V6St0FRyEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V6b3wVRyEeCQNNgUSH7L8A"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_YPJsYFRyEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_YO2xcFRyEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_YPJsYVRyEeCQNNgUSH7L8A"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_oF0xgFRvEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_oFrnkFRvEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_oF0xgVRvEeCQNNgUSH7L8A"/>
+      <children xmi:type="notation:Node" xmi:id="_Bl668GwGEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_BloAAGwGEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Bl668WwGEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_DnQgkGwGEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_DnHWoGwGEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DnQgkWwGEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_EiRXUGwGEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_EiHmUGwGEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EiRXUWwGEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_F96O4GwGEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_F9xE8GwGEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_F96O4WwGEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_IarMQGwGEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_IahbQGwGEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IarMQWwGEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_AMdZYGwhEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_AMKecGwhEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AMdZYWwhEeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_MhekV1RyEeCQNNgUSH7L8A" showTitle="true"/>
@@ -297,5 +457,5 @@
     <styles xmi:type="notation:CanonicalStyle" xmi:id="_MhUzUVRyEeCQNNgUSH7L8A"/>
     <element xmi:type="uml:Class" href="refactoring.uml#_MhLCUFRyEeCQNNgUSH7L8A"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MhUzUlRyEeCQNNgUSH7L8A" x="710" y="560" width="146"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MhUzUlRyEeCQNNgUSH7L8A" x="795" y="550" width="146"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_zS1aEFnhEeClo8qtmvnTtw" type="2001" fontName="Calibri">
@@ -305,4 +465,28 @@
     <children xmi:type="notation:DecorationNode" xmi:id="_zS1aFFnhEeClo8qtmvnTtw" type="5019"/>
     <children xmi:type="notation:BasicCompartment" xmi:id="_zS1aFVnhEeClo8qtmvnTtw" type="7001">
+      <children xmi:type="notation:Node" xmi:id="_lS7ZsGv1EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_SBMnYFVZEeCOu_gAbBroWQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lS7ZsWv1EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_7aq90Gv-EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_7aYC4Gv-EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7aq90Wv-EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_8PuWgGv-EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_8Pa0gGv-EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8PuWgWv-EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_8ylzAGv-EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_8yS4EGv-EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8ylzAWv-EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_BljLsGv_EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_BlQQwGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_BljLsWv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_CySroGv_EeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_Cx_wsGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CySroWv_EeCIG-Xw7oAxcQ"/>
+      </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_zS1aFlnhEeClo8qtmvnTtw" showTitle="true"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_zS1aF1nhEeClo8qtmvnTtw"/>
@@ -311,8 +495,4 @@
     </children>
     <children xmi:type="notation:BasicCompartment" xmi:id="_zS1aGlnhEeClo8qtmvnTtw" type="7002">
-      <children xmi:type="notation:Node" xmi:id="_8dpj0FnhEeClo8qtmvnTtw" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_8dM34FnhEeClo8qtmvnTtw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8dpj0VnhEeClo8qtmvnTtw"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="_b4tUYFRvEeCQNNgUSH7L8A" type="3002">
         <element xmi:type="uml:Operation" href="refactoring.uml#_b4aZcFRvEeCQNNgUSH7L8A"/>
@@ -347,11 +527,31 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_snNSAVRvEeCQNNgUSH7L8A"/>
       </children>
-      <children xmi:type="notation:Node" xmi:id="_J4D38FSnEeCQNNgUSH7L8A" type="3002">
-        <element xmi:type="uml:Operation" href="refactoring.uml#_J3w9AFSnEeCQNNgUSH7L8A"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_J4D38VSnEeCQNNgUSH7L8A"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="_SLu-UFSnEeCQNNgUSH7L8A" type="3002">
         <element xmi:type="uml:Operation" href="refactoring.uml#_SLcDYFSnEeCQNNgUSH7L8A"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_SLu-UVSnEeCQNNgUSH7L8A"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_JrEhUGv_EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_JqxmYGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JrEhUWv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_tE8Y8Gv_EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_tEo28Gv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tE8Y8Wv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_twJ5IGv_EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_tv2-MGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_twJ5IWv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ww-l0Gv_EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_wwrD0Gv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ww-l0Wv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_ykApsGv_EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_yjtuwGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ykApsWv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_zmxHMGv_EeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_zmeMQGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zmxHMWv_EeCIG-Xw7oAxcQ"/>
       </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_zS1aG1nhEeClo8qtmvnTtw" showTitle="true"/>
@@ -368,5 +568,5 @@
     <styles xmi:type="notation:CanonicalStyle" xmi:id="_zS1aEVnhEeClo8qtmvnTtw"/>
     <element xmi:type="uml:Class" href="refactoring.uml#_zSPkMFnhEeClo8qtmvnTtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zS1aElnhEeClo8qtmvnTtw" x="485" y="30"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zS1aElnhEeClo8qtmvnTtw" x="1225" y="230" width="238"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_n5KbMFolEeClo8qtmvnTtw" type="2001" fontName="Calibri">
@@ -388,4 +588,8 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_JER8QVomEeClo8qtmvnTtw"/>
       </children>
+      <children xmi:type="notation:Node" xmi:id="_IW42cGwcEeCIG-Xw7oAxcQ" type="3001">
+        <element xmi:type="uml:Property" href="refactoring.uml#_IWl7gGwcEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IW42cWwcEeCIG-Xw7oAxcQ"/>
+      </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_n5KbNlolEeClo8qtmvnTtw" showTitle="true"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_n5KbN1olEeClo8qtmvnTtw"/>
@@ -394,4 +598,8 @@
     </children>
     <children xmi:type="notation:BasicCompartment" xmi:id="_n5KbOlolEeClo8qtmvnTtw" type="7002">
+      <children xmi:type="notation:Node" xmi:id="_Nuz9YGwcEeCIG-Xw7oAxcQ" type="3002">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_NugbYGwcEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Nuz9YWwcEeCIG-Xw7oAxcQ"/>
+      </children>
       <styles xmi:type="notation:TitleStyle" xmi:id="_n5KbO1olEeClo8qtmvnTtw" showTitle="true"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_n5KbPFolEeClo8qtmvnTtw"/>
@@ -407,5 +615,5 @@
     <styles xmi:type="notation:CanonicalStyle" xmi:id="_n5KbMVolEeClo8qtmvnTtw"/>
     <element xmi:type="uml:Class" href="refactoring.uml#_n4H5YFolEeClo8qtmvnTtw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n5KbMlolEeClo8qtmvnTtw" x="510" y="355"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n5KbMlolEeClo8qtmvnTtw" x="580" y="355"/>
   </children>
   <children xmi:type="notation:Shape" xmi:id="_6v4_gFxoEeCd3KUH_BuVkA" type="2013" fontName="Calibri">
@@ -431,5 +639,77 @@
     </children>
     <element xmi:type="uml:Interface" href="refactoring.uml#_6vSikFxoEeCd3KUH_BuVkA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6v4_gVxoEeCd3KUH_BuVkA" x="773" y="118"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6v4_gVxoEeCd3KUH_BuVkA" x="555" y="205"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ed2NsGv0EeCIG-Xw7oAxcQ" type="2013" fontName="Calibri">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ed2Nsmv0EeCIG-Xw7oAxcQ" type="5018"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ed2Ns2v0EeCIG-Xw7oAxcQ" type="5035"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ed2NtGv0EeCIG-Xw7oAxcQ" type="7029">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ed2NtWv0EeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ed2Ntmv0EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ed2Nt2v0EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_ed_-sGv0EeCIG-Xw7oAxcQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ed_-sWv0EeCIG-Xw7oAxcQ" type="7030">
+      <children xmi:type="notation:Node" xmi:id="_OLPd4GwgEeCIG-Xw7oAxcQ" type="3029">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_OK8i8GwgEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OLPd4WwgEeCIG-Xw7oAxcQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ed_-smv0EeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ed_-s2v0EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ed_-tGv0EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_ed_-tWv0EeCIG-Xw7oAxcQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ed_-tmv0EeCIG-Xw7oAxcQ" type="7031">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ed_-t2v0EeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ed_-uGv0EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ed_-uWv0EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_ed_-umv0EeCIG-Xw7oAxcQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="refactoring.uml#_edQX0Gv0EeCIG-Xw7oAxcQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ed2NsWv0EeCIG-Xw7oAxcQ" x="995" y="360"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_b1XHgGv_EeCIG-Xw7oAxcQ" type="2013" fontName="Calibri">
+    <children xmi:type="notation:DecorationNode" xmi:id="_b1g4gGv_EeCIG-Xw7oAxcQ" type="5018"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_b1g4gWv_EeCIG-Xw7oAxcQ" type="5035"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_b1g4gmv_EeCIG-Xw7oAxcQ" type="7029">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_b1g4g2v_EeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_b1g4hGv_EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_b1g4hWv_EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_b1g4hmv_EeCIG-Xw7oAxcQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_b1g4h2v_EeCIG-Xw7oAxcQ" type="7030">
+      <children xmi:type="notation:Node" xmi:id="_Fm7hAGwAEeCIG-Xw7oAxcQ" type="3029">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_Fmn_AGwAEeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Fm7hAWwAEeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_J4D38FSnEeCQNNgUSH7L8A" type="3029">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_J3w9AFSnEeCQNNgUSH7L8A"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_J4D38VSnEeCQNNgUSH7L8A"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_LNt_0Gv_EeCIG-Xw7oAxcQ" type="3029">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_LNRT4Gv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LNt_0Wv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_MvKkcGv_EeCIG-Xw7oAxcQ" type="3029">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_Mu3pgGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MvKkcWv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_OCUOYGv_EeCIG-Xw7oAxcQ" type="3029">
+        <element xmi:type="uml:Operation" href="refactoring.uml#_OCBTcGv_EeCIG-Xw7oAxcQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OCUOYWv_EeCIG-Xw7oAxcQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_b1g4iGv_EeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_b1g4iWv_EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_b1g4imv_EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_b1g4i2v_EeCIG-Xw7oAxcQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_b1g4jGv_EeCIG-Xw7oAxcQ" type="7031">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_b1g4jWv_EeCIG-Xw7oAxcQ" showTitle="true"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_b1g4jmv_EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_b1g4j2v_EeCIG-Xw7oAxcQ"/>
+      <styles xmi:type="notation:CanonicalStyle" xmi:id="_b1g4kGv_EeCIG-Xw7oAxcQ"/>
+    </children>
+    <element xmi:type="uml:Interface" href="refactoring.uml#_b1EMkGv_EeCIG-Xw7oAxcQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b1XHgWv_EeCIG-Xw7oAxcQ" x="1225" y="10"/>
   </children>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_Uz4jkVRrEeCQNNgUSH7L8A"/>
@@ -441,9 +721,9 @@
       <layoutConstraint xmi:type="notation:Location" xmi:id="_8RbsBVlNEeCTIL9CCJRwPw" y="40"/>
     </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_8RbsAllNEeCTIL9CCJRwPw" fontName="Calibri"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_8RbsAllNEeCTIL9CCJRwPw" fontName="Calibri" fontHeight="14"/>
     <element xmi:type="uml:Generalization" href="refactoring.uml#_8RbsAFlNEeCTIL9CCJRwPw"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8RbsA1lNEeCTIL9CCJRwPw" points="[0, 0, -14, 51]$[13, -39, -1, 12]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Rk18FlNEeCTIL9CCJRwPw" id="(0.4178082191780822,0.005025125628140704)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Rk18VlNEeCTIL9CCJRwPw" id="(0.40540540540540543,0.969309462915601)"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Rk18FlNEeCTIL9CCJRwPw" id="(0.5273972602739726,0.01639344262295082)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8Rk18VlNEeCTIL9CCJRwPw" id="(0.5824742268041238,0.9956043956043956)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="_JJtsYVlWEeCTIL9CCJRwPw" type="4002" source="_MhUzUFRyEeCQNNgUSH7L8A" target="_Plrj4FRsEeCQNNgUSH7L8A">
@@ -455,9 +735,9 @@
     </children>
     <styles xmi:type="notation:RoutingStyle" xmi:id="_JJtsYllWEeCTIL9CCJRwPw"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_JJtsY1lWEeCTIL9CCJRwPw" fontName="Calibri"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_JJtsY1lWEeCTIL9CCJRwPw" fontName="Calibri" fontHeight="14"/>
     <element xmi:type="uml:Dependency" href="refactoring.uml#_JJtsYFlWEeCTIL9CCJRwPw"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JJtsZFlWEeCTIL9CCJRwPw" points="[-16, 0, 34, 0]$[-50, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJ3dYFlWEeCTIL9CCJRwPw" id="(0.1095890410958904,0.5025125628140703)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJ3dYVlWEeCTIL9CCJRwPw" id="(1.0,0.3005464480874317)"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJ3dYFlWEeCTIL9CCJRwPw" id="(0.0,0.5409836065573771)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJ3dYVlWEeCTIL9CCJRwPw" id="(0.989247311827957,0.363914373088685)"/>
   </edges>
   <edges xmi:type="notation:Connector" xmi:id="_Chj2IVomEeClo8qtmvnTtw" type="4001" source="_Plrj4FRsEeCQNNgUSH7L8A" target="_n5KbMFolEeClo8qtmvnTtw">
@@ -465,8 +745,8 @@
       <layoutConstraint xmi:type="notation:Location" xmi:id="_Chj2JVomEeClo8qtmvnTtw" y="40"/>
     </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Chj2IlomEeClo8qtmvnTtw" fontName="Calibri"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Chj2IlomEeClo8qtmvnTtw" fontName="Calibri" fontHeight="14"/>
     <element xmi:type="uml:Generalization" href="refactoring.uml#_Chj2IFomEeClo8qtmvnTtw"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Chj2I1omEeClo8qtmvnTtw" points="[-2, -33, 11, 58]$[14, -47, 27, 44]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ChtAEFomEeClo8qtmvnTtw" id="(1.0,0.19760479041916168)"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ChtAEFomEeClo8qtmvnTtw" id="(0.6505376344086021,0.0061162079510703364)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="_OyMHkFqlEeC9SaX6k5fY1Q" type="4002" source="_Z0FxQFRvEeCQNNgUSH7L8A" target="_zS1aEFnhEeClo8qtmvnTtw">
@@ -478,9 +758,9 @@
     </children>
     <styles xmi:type="notation:RoutingStyle" xmi:id="_OyMHkVqlEeC9SaX6k5fY1Q"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_OyMHklqlEeC9SaX6k5fY1Q" fontName="Calibri"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_OyMHklqlEeC9SaX6k5fY1Q" fontName="Calibri" fontHeight="14"/>
     <element xmi:type="uml:Dependency" href="refactoring.uml#_OyCWkFqlEeC9SaX6k5fY1Q"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OyMHk1qlEeC9SaX6k5fY1Q" points="[-12, -1, 96, 4]$[-94, -4, 14, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OyV4kFqlEeC9SaX6k5fY1Q" id="(0.11214953271028037,0.5298013245033113)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OyV4kVqlEeC9SaX6k5fY1Q" id="(0.9054054054054054,0.5254237288135594)"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OyMHk1qlEeC9SaX6k5fY1Q" points="[5, 0, -277, -149]$[155, 0, -127, -149]$[155, 149, -127, 0]$[281, 149, -1, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OyV4kFqlEeC9SaX6k5fY1Q" id="(0.9742268041237113,0.21318681318681318)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OyV4kVqlEeC9SaX6k5fY1Q" id="(0.004201680672268907,0.12530712530712532)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="_VjhRcFqlEeC9SaX6k5fY1Q" type="4002" source="_Z0FxQFRvEeCQNNgUSH7L8A" target="_n5KbMFolEeClo8qtmvnTtw">
@@ -492,20 +772,134 @@
     </children>
     <styles xmi:type="notation:RoutingStyle" xmi:id="_VjhRcVqlEeC9SaX6k5fY1Q"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_VjhRclqlEeC9SaX6k5fY1Q" fontName="Calibri"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VjhRclqlEeC9SaX6k5fY1Q" fontName="Calibri" fontHeight="14"/>
     <element xmi:type="uml:Dependency" href="refactoring.uml#_VjNvcFqlEeC9SaX6k5fY1Q"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VjhRc1qlEeC9SaX6k5fY1Q" points="[-3, 1, 165, -25]$[-160, -26, 8, -52]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VjqbYFqlEeC9SaX6k5fY1Q" id="(0.028037383177570093,0.6026490066225165)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_xwYYgF0FEeCEEfnO4j572A" type="4002" source="_4MKRAFRxEeCQNNgUSH7L8A" target="_aKUcwFRrEeCQNNgUSH7L8A">
-    <children xmi:type="notation:DecorationNode" xmi:id="_xwYYhF0FEeCEEfnO4j572A" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xwYYhV0FEeCEEfnO4j572A" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xwYYhl0FEeCEEfnO4j572A" type="6010">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_xwYYh10FEeCEEfnO4j572A" y="20"/>
-    </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_xwYYgV0FEeCEEfnO4j572A"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_xwYYgl0FEeCEEfnO4j572A" fontName="Calibri"/>
-    <element xmi:type="uml:Dependency" href="refactoring.uml#_xv7skF0FEeCEEfnO4j572A"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xwYYg10FEeCEEfnO4j572A" points="[-4, -99, -6, 145]$[-22, -128, -24, 116]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VjqbYFqlEeC9SaX6k5fY1Q" id="(0.005154639175257732,0.8373626373626374)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0oI3EGwfEeCIG-Xw7oAxcQ" id="(0.9847328244274809,0.37748344370860926)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_jVeqAGv_EeCIG-Xw7oAxcQ" type="4010" source="_b1XHgGv_EeCIG-Xw7oAxcQ" target="_zS1aEFnhEeClo8qtmvnTtw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_jVeqBGv_EeCIG-Xw7oAxcQ" type="6011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jVeqBWv_EeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_jVeqBmv_EeCIG-Xw7oAxcQ" type="6021">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_jVeqB2v_EeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_jVeqAWv_EeCIG-Xw7oAxcQ"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jVeqAmv_EeCIG-Xw7oAxcQ" fontName="Calibri" fontHeight="14"/>
+    <element xmi:type="uml:Realization" href="refactoring.uml#_jVU5AGv_EeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jVeqA2v_EeCIG-Xw7oAxcQ" points="[0, 0, -80, 47]$[80, 106, 0, 153]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jVxk8Gv_EeCIG-Xw7oAxcQ" id="(0.49344978165938863,0.9871794871794872)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jVxk8Wv_EeCIG-Xw7oAxcQ" id="(0.47478991596638653,0.007371007371007371)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_FRa9gGwgEeCIG-Xw7oAxcQ" type="4010" source="_ed2NsGv0EeCIG-Xw7oAxcQ" target="_Z0FxQFRvEeCQNNgUSH7L8A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_FRa9hGwgEeCIG-Xw7oAxcQ" type="6011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FRa9hWwgEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_FRa9hmwgEeCIG-Xw7oAxcQ" type="6021">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_FRa9h2wgEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_FRa9gWwgEeCIG-Xw7oAxcQ"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_FRa9gmwgEeCIG-Xw7oAxcQ" fontName="Calibri" fontHeight="14"/>
+    <element xmi:type="uml:Realization" href="refactoring.uml#_FRRzkGwgEeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FRa9g2wgEeCIG-Xw7oAxcQ" points="[-201, -33, 48, 0]$[-206, -33, 43, 0]$[-247, -33, 2, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FRkugGwgEeCIG-Xw7oAxcQ" id="(1.0,0.7049180327868853)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FRkugWwgEeCIG-Xw7oAxcQ" id="(0.9896907216494846,0.7824175824175824)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_VYcEYWwgEeCIG-Xw7oAxcQ" type="4013" source="_zS1aEFnhEeClo8qtmvnTtw" target="_ed2NsGv0EeCIG-Xw7oAxcQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_VYcEZGwgEeCIG-Xw7oAxcQ" type="6023">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_VYcEZWwgEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_VYcEYmwgEeCIG-Xw7oAxcQ" fontName="Calibri" fontHeight="14"/>
+    <element xmi:type="uml:Usage" href="refactoring.uml#_VYcEYGwgEeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VYcEY2wgEeCIG-Xw7oAxcQ" points="[0, 0, 56, 3]$[-29, -1, 27, 2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VYlOUGwgEeCIG-Xw7oAxcQ" id="(0.0,0.4594594594594595)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VYlOUWwgEeCIG-Xw7oAxcQ" id="(0.8656716417910447,0.5869565217391305)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_nbAcgWwhEeCIG-Xw7oAxcQ" type="4010" source="_4MKRAFRxEeCQNNgUSH7L8A" target="_6v4_gFxoEeCd3KUH_BuVkA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_nbAchWwhEeCIG-Xw7oAxcQ" type="6011">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_nbAchmwhEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_nbAch2whEeCIG-Xw7oAxcQ" type="6021">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_nbAciGwhEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_nbAcgmwhEeCIG-Xw7oAxcQ"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_nbAcg2whEeCIG-Xw7oAxcQ" fontName="Calibri"/>
+    <element xmi:type="uml:Realization" href="refactoring.uml#_nbAcgGwhEeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nbAchGwhEeCIG-Xw7oAxcQ" points="[0, 0, -75, 6]$[52, -4, -23, 2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nbKNgGwhEeCIG-Xw7oAxcQ" id="(0.9946236559139785,0.4954128440366973)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nbKNgWwhEeCIG-Xw7oAxcQ" id="(0.21232876712328766,0.5737704918032787)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_oXghAGwhEeCIG-Xw7oAxcQ" type="4013" source="_Z0FxQFRvEeCQNNgUSH7L8A" target="_6v4_gFxoEeCd3KUH_BuVkA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_oXghA2whEeCIG-Xw7oAxcQ" type="6023">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_oXghBGwhEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_oXghAWwhEeCIG-Xw7oAxcQ" fontName="Calibri"/>
+    <element xmi:type="uml:Usage" href="refactoring.uml#_oXWwAGwhEeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oXghAmwhEeCIG-Xw7oAxcQ" points="[0, -2, 95, 2]$[-41, -2, 54, 2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oXqSAGwhEeCIG-Xw7oAxcQ" id="(0.015463917525773196,0.43736263736263736)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_vQlRoGwhEeCIG-Xw7oAxcQ" type="4005" source="_Plrj4FRsEeCQNNgUSH7L8A" target="_4MKRAFRxEeCQNNgUSH7L8A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRpGwhEeCIG-Xw7oAxcQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRpWwhEeCIG-Xw7oAxcQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRpmwhEeCIG-Xw7oAxcQ" visible="false" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRp2whEeCIG-Xw7oAxcQ" y="-15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRqGwhEeCIG-Xw7oAxcQ" visible="false" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRqWwhEeCIG-Xw7oAxcQ" y="-15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRqmwhEeCIG-Xw7oAxcQ" type="6006">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRq2whEeCIG-Xw7oAxcQ" y="-30"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRrGwhEeCIG-Xw7oAxcQ" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRrWwhEeCIG-Xw7oAxcQ" y="-30"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRrmwhEeCIG-Xw7oAxcQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRr2whEeCIG-Xw7oAxcQ" y="15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRsGwhEeCIG-Xw7oAxcQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRsWwhEeCIG-Xw7oAxcQ" y="15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vQlRsmwhEeCIG-Xw7oAxcQ" type="6019">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vQlRs2whEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_vQlRoWwhEeCIG-Xw7oAxcQ"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_vQlRomwhEeCIG-Xw7oAxcQ" fontName="Calibri"/>
+    <element xmi:type="uml:Association" href="refactoring.uml#_vQIlsGwhEeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vQlRo2whEeCIG-Xw7oAxcQ" points="[0, 0, 151, 288]$[-151, 0, 0, 288]$[-151, -254, 0, 34]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRB9kGwhEeCIG-Xw7oAxcQ" id="(0.0,0.3547400611620795)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRB9kWwhEeCIG-Xw7oAxcQ" id="(0.3978494623655914,0.8960244648318043)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_3dsdB2whEeCIG-Xw7oAxcQ" type="4005" source="_aKUcwFRrEeCQNNgUSH7L8A" target="_4MKRAFRxEeCQNNgUSH7L8A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdC2whEeCIG-Xw7oAxcQ" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdDGwhEeCIG-Xw7oAxcQ" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdDWwhEeCIG-Xw7oAxcQ" visible="false" type="6004">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdDmwhEeCIG-Xw7oAxcQ" y="-15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdD2whEeCIG-Xw7oAxcQ" visible="false" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdEGwhEeCIG-Xw7oAxcQ" y="-15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdEWwhEeCIG-Xw7oAxcQ" type="6006">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdEmwhEeCIG-Xw7oAxcQ" y="-30"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdE2whEeCIG-Xw7oAxcQ" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdFGwhEeCIG-Xw7oAxcQ" y="-30"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdFWwhEeCIG-Xw7oAxcQ" type="6008">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdFmwhEeCIG-Xw7oAxcQ" y="15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdF2whEeCIG-Xw7oAxcQ" type="6009">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdGGwhEeCIG-Xw7oAxcQ" y="15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3dsdGWwhEeCIG-Xw7oAxcQ" type="6019">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3dsdGmwhEeCIG-Xw7oAxcQ" y="40"/>
+    </children>
+    <styles xmi:type="notation:RoutingStyle" xmi:id="_3dsdCGwhEeCIG-Xw7oAxcQ"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3dsdCWwhEeCIG-Xw7oAxcQ" fontName="Calibri"/>
+    <element xmi:type="uml:Association" href="refactoring.uml#_3dsdAGwhEeCIG-Xw7oAxcQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3dsdCmwhEeCIG-Xw7oAxcQ" points="[0, -1, -77, 1]$[77, 112, 0, 114]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3d2OAGwhEeCIG-Xw7oAxcQ" id="(1.0,0.535593220338983)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3d2OAWwhEeCIG-Xw7oAxcQ" id="(0.043010752688172046,0.5351681957186545)"/>
   </edges>
 </notation:Diagram>
Index: plications/editors/josm/plugins/videomapping/uml/rendering.uml
===================================================================
--- /applications/editors/josm/plugins/videomapping/uml/rendering.uml	(revision 25893)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_SO8y4WaZEeCmUYnH9FIoXQ">
-  <packagedElement xmi:type="uml:Interaction" xmi:id="_5UKo8GabEeCmUYnH9FIoXQ" name="Interaction">
-    <lifeline xmi:id="_6Q9oYGabEeCmUYnH9FIoXQ" name="a" coveredBy="_7iLYomabEeCmUYnH9FIoXQ _7iLYoGabEeCmUYnH9FIoXQ _7iLYpWabEeCmUYnH9FIoXQ"/>
-    <lifeline xmi:id="_64TVMGabEeCmUYnH9FIoXQ" name="b" coveredBy="_7iLYo2abEeCmUYnH9FIoXQ _7iLYoWabEeCmUYnH9FIoXQ _7iLYpGabEeCmUYnH9FIoXQ"/>
-    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_7iLYoGabEeCmUYnH9FIoXQ" name="invocation-1-start" covered="_6Q9oYGabEeCmUYnH9FIoXQ" message="_7iLYpmabEeCmUYnH9FIoXQ"/>
-    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_7iLYoWabEeCmUYnH9FIoXQ" name="execution-1-start" covered="_64TVMGabEeCmUYnH9FIoXQ" message="_7iLYpmabEeCmUYnH9FIoXQ"/>
-    <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_7iLYomabEeCmUYnH9FIoXQ" name="invocation-1-body" covered="_6Q9oYGabEeCmUYnH9FIoXQ" start="_7iLYoGabEeCmUYnH9FIoXQ" finish="_7iLYpWabEeCmUYnH9FIoXQ"/>
-    <fragment xmi:type="uml:BehaviorExecutionSpecification" xmi:id="_7iLYo2abEeCmUYnH9FIoXQ" name="execution-1-body" covered="_64TVMGabEeCmUYnH9FIoXQ" start="_7iLYoWabEeCmUYnH9FIoXQ" finish="_7iLYpGabEeCmUYnH9FIoXQ"/>
-    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_7iLYpGabEeCmUYnH9FIoXQ" name="execution-1-finish" covered="_64TVMGabEeCmUYnH9FIoXQ"/>
-    <fragment xmi:type="uml:MessageOccurrenceSpecification" xmi:id="_7iLYpWabEeCmUYnH9FIoXQ" name="invocation-1-finish" covered="_6Q9oYGabEeCmUYnH9FIoXQ"/>
-    <message xmi:id="_7iLYpmabEeCmUYnH9FIoXQ" name="Message" receiveEvent="_7iLYoWabEeCmUYnH9FIoXQ" sendEvent="_7iLYoGabEeCmUYnH9FIoXQ"/>
-  </packagedElement>
-</uml:Package>
Index: plications/editors/josm/plugins/videomapping/uml/rendering.umlseq
===================================================================
--- /applications/editors/josm/plugins/videomapping/uml/rendering.umlseq	(revision 25893)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmlns:uml2t.seqd.notation="http://www.eclipse.org/mdt/uml2tools/sequence-diagram/notation/2008" xmi:id="_SRLngGaZEeCmUYnH9FIoXQ" type="UMLSequence" name="rendering.umlseq" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_5UnU4GabEeCmUYnH9FIoXQ" type="2001" fontName="Calibri">
-    <children xmi:type="notation:DecorationNode" xmi:id="_5UnU42abEeCmUYnH9FIoXQ" type="5002"/>
-    <children xmi:type="notation:Shape" xmi:id="_6RRKYGabEeCmUYnH9FIoXQ" type="3001" fontName="Calibri">
-      <children xmi:type="notation:DecorationNode" xmi:id="_6RRKYmabEeCmUYnH9FIoXQ" type="5001"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_6RRKY2abEeCmUYnH9FIoXQ" type="5005"/>
-      <children xmi:type="notation:Shape" xmi:id="_7ioEkGabEeCmUYnH9FIoXQ" type="3004" fontName="Calibri">
-        <element xmi:type="uml:BehaviorExecutionSpecification" href="rendering.uml#_7iLYomabEeCmUYnH9FIoXQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ioEkWabEeCmUYnH9FIoXQ" x="20" y="103" width="20" height="24"/>
-      </children>
-      <element xmi:type="uml:Lifeline" href="rendering.uml#_6Q9oYGabEeCmUYnH9FIoXQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RRKYWabEeCmUYnH9FIoXQ" x="30" y="28" width="60" height="300"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_64wBIGabEeCmUYnH9FIoXQ" type="3001" fontName="Calibri">
-      <children xmi:type="notation:DecorationNode" xmi:id="_64wBImabEeCmUYnH9FIoXQ" type="5001"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_64wBI2abEeCmUYnH9FIoXQ" type="5005"/>
-      <children xmi:type="notation:Shape" xmi:id="_7ioEkmabEeCmUYnH9FIoXQ" type="3004" fontName="Calibri">
-        <element xmi:type="uml:BehaviorExecutionSpecification" href="rendering.uml#_7iLYo2abEeCmUYnH9FIoXQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ioEk2abEeCmUYnH9FIoXQ" x="20" y="103" width="20" height="24"/>
-      </children>
-      <element xmi:type="uml:Lifeline" href="rendering.uml#_64TVMGabEeCmUYnH9FIoXQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_64wBIWabEeCmUYnH9FIoXQ" x="120" y="28" width="60" height="300"/>
-    </children>
-    <styles xmi:type="uml2t.seqd.notation:SDModelStorageStyle" xmi:id="_5UnU4WabEeCmUYnH9FIoXQ"/>
-    <element xmi:type="uml:Interaction" href="rendering.uml#_5UKo8GabEeCmUYnH9FIoXQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5UnU4mabEeCmUYnH9FIoXQ" x="295" y="85" width="230" height="338"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_SRLngWaZEeCmUYnH9FIoXQ"/>
-  <element xmi:type="uml:Package" href="rendering.uml#_SO8y4WaZEeCmUYnH9FIoXQ"/>
-  <edges xmi:type="notation:Edge" xmi:id="_7ixOgGabEeCmUYnH9FIoXQ" type="4001" source="_7ioEkGabEeCmUYnH9FIoXQ" target="_7ioEkmabEeCmUYnH9FIoXQ">
-    <children xmi:type="notation:DecorationNode" xmi:id="_7ixOhGabEeCmUYnH9FIoXQ" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_7ixOhWabEeCmUYnH9FIoXQ" y="-10"/>
-    </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_7ixOgWabEeCmUYnH9FIoXQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_7ixOgmabEeCmUYnH9FIoXQ" fontName="Calibri"/>
-    <styles xmi:type="notation:IntListValueStyle" xmi:id="_7i6_gWabEeCmUYnH9FIoXQ" name="SourceAnchor">
-      <intListValue>365</intListValue>
-      <intListValue>216</intListValue>
-    </styles>
-    <styles xmi:type="notation:IntListValueStyle" xmi:id="_7i6_g2abEeCmUYnH9FIoXQ" name="TargetAnchor">
-      <intListValue>435</intListValue>
-      <intListValue>216</intListValue>
-    </styles>
-    <element xmi:type="uml:Message" href="rendering.uml#_7iLYpmabEeCmUYnH9FIoXQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ixOg2abEeCmUYnH9FIoXQ" points="[30, -16, -60, -16]$[73, -150, -17, -150]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7i6_gGabEeCmUYnH9FIoXQ" id="(1.0,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7i6_gmabEeCmUYnH9FIoXQ" id="(0.0,0.0)"/>
-  </edges>
-</notation:Diagram>