Commits

mazaninfardi  committed 5dff9e5

Solved problems with the new dtd file
moved settings to a text file system.properties

  • Participants
  • Parent commits af7b38f

Comments (0)

Files changed (63)

 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar" sourcepath="F:/Mazanin Related/Course and Projects/Master Thesis/dom4j/src"/>
+	<classpathentry kind="lib" path="lib/jaxen-1.1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

File documents/gxf.dtd

-<!ELEMENT gxf (node*,edge*)>
-<!ELEMENT node (id,type?,port*)>
-<!ATTLIST node
-	xlink:type (resource) 	#FIXED "resource"
-	id		ID	#REQUIRED>
-<!ELEMENT port (id,type?,size?,const?,restrict?,static?,volatile?,constp?,volatilep?)>
-<!ATTLIST port
-	xlink:type (resource) 	#FIXED "resource"
-	id		ID	#REQUIRED>
-<!ELEMENT edge (type,from,to)>
-<!ELEMENT from (node)>
-<!ELEMENT to (node)>

File documents/test.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE gxf SYSTEM "gxf.dtd">
-<gxf xmlns:xlink='http://www.w3.org/1999/xlink' xlink:type='extended'>
-	<node xlink:type='resource' id='w11a_r_source' xlink:label='w11a_r_source'>
-		<id>w11a_r_source</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_source:in' xlink:label='w11a_r_source:in'>
-			<id>in</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-			<const />
-		</port>
-		<port xlink:type='resource' id='w11a_r_source:out' xlink:label='w11a_r_source:out'>
-			<id>out</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-		</port>
-		<node xlink:type='resource' id='w11a_r_source:process'
-			xlink:label='w11a_r_source:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_source:process:in'
-				xlink:label='w11a_r_source:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_hardbits_t</type>
-				<size>1</size>
-				<const />
-			</port>
-			<port xlink:type='resource' id='w11a_r_source:process:out'
-				xlink:label='w11a_r_source:process:out'>
-				<id>out</id>
-				<type>ofdm_symbol_waveform_t</type>
-				<size>1</size>
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_source:in'
-			xlink:to='w11a_r_source:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_source:out'
-			xlink:to='w11a_r_source:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_sink' xlink:label='w11a_r_sink'>
-		<id>w11a_r_sink</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_sink:in' xlink:label='w11a_r_sink:in'>
-			<id>in</id>
-			<type>uint8_t</type>
-			<size>27</size>
-			<const />
-		</port>
-		<node xlink:type='resource' id='w11a_r_sink:process' xlink:label='w11a_r_sink:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_sink:process:in'
-				xlink:label='w11a_r_sink:process:in'>
-				<id>in</id>
-				<type>uint8_t</type>
-				<size>27</size>
-				<const />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_sink:in'
-			xlink:to='w11a_r_sink:process:in' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_switch' xlink:label='w11a_r_switch'>
-		<id>w11a_r_switch</id>
-		<type>strict</type>
-		<port xlink:type='resource' id='w11a_r_switch:in' xlink:label='w11a_r_switch:in'>
-			<id>in</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_switch:tag' xlink:label='w11a_r_switch:tag'>
-			<id>tag</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_switch:synch_buf'
-			xlink:label='w11a_r_switch:synch_buf'>
-			<id>synch_buf</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_switch:header_buf'
-			xlink:label='w11a_r_switch:header_buf'>
-			<id>header_buf</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_switch:payload_buf'
-			xlink:label='w11a_r_switch:payload_buf'>
-			<id>payload_buf</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_switch:crc_buf'
-			xlink:label='w11a_r_switch:crc_buf'>
-			<id>crc_buf</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_switch:out_tag'
-			xlink:label='w11a_r_switch:out_tag'>
-			<id>out_tag</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_switch:process'
-			xlink:label='w11a_r_switch:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_switch:process:in'
-				xlink:label='w11a_r_switch:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_waveform_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_switch:process:tag'
-				xlink:label='w11a_r_switch:process:tag'>
-				<id>tag</id>
-				<type>w11a_r_mode_tag_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_switch:process:out'
-				xlink:label='w11a_r_switch:process:out'>
-				<id>out</id>
-				<type>w11a_r_selective_out_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_switch:in'
-			xlink:to='w11a_r_switch:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_switch:tag'
-			xlink:to='w11a_r_switch:process:tag' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_switch:synch_buf'
-			xlink:to='w11a_r_switch:process:out' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_switch:header_buf'
-			xlink:to='w11a_r_switch:process:out' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_switch:payload_buf'
-			xlink:to='w11a_r_switch:process:out' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_switch:crc_buf'
-			xlink:to='w11a_r_switch:process:out' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_switch:out_tag'
-			xlink:to='w11a_r_switch:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_mc' xlink:label='w11a_r_mc'>
-		<id>w11a_r_mc</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_mc:outs' xlink:label='w11a_r_mc:outs'>
-			<id>outs</id>
-			<type>w11a_r_mc_state_t</type>
-			<size>1</size>
-		</port>
-		<port xlink:type='resource' id='w11a_r_mc:in' xlink:label='w11a_r_mc:in'>
-			<id>in</id>
-			<type>w11a_r_select_out_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_mc:out' xlink:label='w11a_r_mc:out'>
-			<id>out</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_mc:inst' xlink:label='w11a_r_mc:inst'>
-			<id>inst</id>
-			<type>w11a_r_mc_state_t</type>
-			<size>1</size>
-			<const />
-		</port>
-		<node xlink:type='resource' id='w11a_r_mc:ctor' xlink:label='w11a_r_mc:ctor'>
-			<id>ctor</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_mc:ctor:outs'
-				xlink:label='w11a_r_mc:ctor:outs'>
-				<id>outs</id>
-				<type>w11a_r_mc_state_t</type>
-				<size>1</size>
-			</port>
-		</node>
-		<node xlink:type='resource' id='w11a_r_mc:process' xlink:label='w11a_r_mc:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_mc:process:in'
-				xlink:label='w11a_r_mc:process:in'>
-				<id>in</id>
-				<type>w11a_r_select_out_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_mc:process:out'
-				xlink:label='w11a_r_mc:process:out'>
-				<id>out</id>
-				<type>w11a_r_mode_tag_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_mc:process:inst'
-				xlink:label='w11a_r_mc:process:inst'>
-				<id>inst</id>
-				<type>w11a_r_mc_state_t</type>
-				<size>1</size>
-				<const />
-			</port>
-			<port xlink:type='resource' id='w11a_r_mc:process:outs'
-				xlink:label='w11a_r_mc:process:outs'>
-				<id>outs</id>
-				<type>w11a_r_mc_state_t</type>
-				<size>1</size>
-			</port>
-		</node>
-		<node xlink:type='resource' id='w11a_r_mc:dtor' xlink:label='w11a_r_mc:dtor'>
-			<id>dtor</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_mc:dtor:inst'
-				xlink:label='w11a_r_mc:dtor:inst'>
-				<id>inst</id>
-				<type>w11a_r_mc_state_t</type>
-				<size>1</size>
-				<const />
-			</port>
-		</node>
-		<endpoint xlink:type='locator' xlink:label='w11a_r_mc:process:outs'
-			xlink:href='#w11a_r_mc:process:outs' />
-		<endpoint xlink:type='locator' xlink:label='w11a_r_mc:dtor:inst'
-			xlink:href='#w11a_r_mc:dtor:inst' />
-		<edge xlink:type='arc' xlink:from='w11a_r_mc:process:outs'
-			xlink:to='w11a_r_mc:dtor:inst'>
-			<type>deinit_state</type>
-			<from>
-				<node id='w11a_r_mc:::process'>
-					<id>process</id>
-					<port id='w11a_r_mc:::process:outs'>
-						<id>outs</id>
-					</port>
-				</node>
-			</from>
-			<to>
-				<node id='w11a_r_mc:::dtor'>
-					<id>dtor</id>
-					<port id='w11a_r_mc:::dtor:inst'>
-						<id>inst</id>
-					</port>
-				</node>
-			</to>
-		</edge>
-		<endpoint xlink:type='locator' xlink:label='w11a_r_mc:ctor:outs'
-			xlink:href='#w11a_r_mc:ctor:outs' />
-		<endpoint xlink:type='locator' xlink:label='w11a_r_mc:process:inst'
-			xlink:href='#w11a_r_mc:process:inst' />
-		<edge xlink:type='arc' xlink:from='w11a_r_mc:ctor:outs' xlink:to='w11a_r_mc:process:inst'>
-			<type>init_state</type>
-			<from>
-				<node id='w11a_r_mc:::ctor'>
-					<id>ctor</id>
-					<port id='w11a_r_mc:::ctor:outs'>
-						<id>outs</id>
-					</port>
-				</node>
-			</from>
-			<to>
-				<node id='w11a_r_mc:::process'>
-					<id>process</id>
-					<port id='w11a_r_mc:::process:inst'>
-						<id>inst</id>
-					</port>
-				</node>
-			</to>
-		</edge>
-		<endpoint xlink:type='locator' xlink:label='w11a_r_mc:process:outs'
-			xlink:href='#w11a_r_mc:process:outs' />
-		<endpoint xlink:type='locator' xlink:label='w11a_r_mc:process:inst'
-			xlink:href='#w11a_r_mc:process:inst' />
-		<edge xlink:type='arc' xlink:from='w11a_r_mc:process:outs'
-			xlink:to='w11a_r_mc:process:inst'>
-			<type>state</type>
-			<from>
-				<node id='w11a_r_mc:::process'>
-					<id>process</id>
-					<port id='w11a_r_mc:::process:outs'>
-						<id>outs</id>
-					</port>
-				</node>
-			</from>
-			<to>
-				<node id='w11a_r_mc:::process'>
-					<id>process</id>
-					<port id='w11a_r_mc:::process:inst'>
-						<id>inst</id>
-					</port>
-				</node>
-			</to>
-		</edge>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_mc:in'
-			xlink:to='w11a_r_mc:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_mc:out'
-			xlink:to='w11a_r_mc:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_select' xlink:label='w11a_r_select'>
-		<id>w11a_r_select</id>
-		<type>strict</type>
-		<port xlink:type='resource' id='w11a_r_select:synch_stat'
-			xlink:label='w11a_r_select:synch_stat'>
-			<id>synch_stat</id>
-			<type>w11a_r_syncstat_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_select:header_stat'
-			xlink:label='w11a_r_select:header_stat'>
-			<id>header_stat</id>
-			<type>uint8_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_select:payload_stat'
-			xlink:label='w11a_r_select:payload_stat'>
-			<id>payload_stat</id>
-			<type>bool</type>
-			<size>0</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_select:crc_stat'
-			xlink:label='w11a_r_select:crc_stat'>
-			<id>crc_stat</id>
-			<type>bool</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_select:in_tag'
-			xlink:label='w11a_r_select:in_tag'>
-			<id>in_tag</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_select:pack' xlink:label='w11a_r_select:pack'>
-			<id>pack</id>
-			<type>w11a_r_select_out_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_select:process'
-			xlink:label='w11a_r_select:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_select:process:in'
-				xlink:label='w11a_r_select:process:in'>
-				<id>in</id>
-				<type>w11a_r_selective_in_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_select:process:pack'
-				xlink:label='w11a_r_select:process:pack'>
-				<id>pack</id>
-				<type>w11a_r_select_out_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_select:synch_stat'
-			xlink:to='w11a_r_select:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_select:header_stat'
-			xlink:to='w11a_r_select:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_select:payload_stat'
-			xlink:to='w11a_r_select:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_select:crc_stat'
-			xlink:to='w11a_r_select:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_select:in_tag'
-			xlink:to='w11a_r_select:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_select:pack'
-			xlink:to='w11a_r_select:process:pack' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_mcdelay' xlink:label='w11a_r_mcdelay'>
-		<id>w11a_r_mcdelay</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_mcdelay:out' xlink:label='w11a_r_mcdelay:out'>
-			<id>out</id>
-			<type>w11a_r_select_out_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_mcdelay:process'
-			xlink:label='w11a_r_mcdelay:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_mcdelay:process:out'
-				xlink:label='w11a_r_mcdelay:process:out'>
-				<id>out</id>
-				<type>w11a_r_select_out_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_mcdelay:out'
-			xlink:to='w11a_r_mcdelay:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_tee2' xlink:label='w11a_r_tee2'>
-		<id>w11a_r_tee2</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_tee2:in' xlink:label='w11a_r_tee2:in'>
-			<id>in</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_tee2:out1' xlink:label='w11a_r_tee2:out1'>
-			<id>out1</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_tee2:out2' xlink:label='w11a_r_tee2:out2'>
-			<id>out2</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_tee2:process' xlink:label='w11a_r_tee2:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_tee2:process:in'
-				xlink:label='w11a_r_tee2:process:in'>
-				<id>in</id>
-				<type>w11a_r_mode_tag_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_tee2:process:out1'
-				xlink:label='w11a_r_tee2:process:out1'>
-				<id>out1</id>
-				<type>w11a_r_mode_tag_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_tee2:process:out2'
-				xlink:label='w11a_r_tee2:process:out2'>
-				<id>out2</id>
-				<type>w11a_r_mode_tag_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_tee2:in'
-			xlink:to='w11a_r_tee2:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_tee2:out1'
-			xlink:to='w11a_r_tee2:process:out1' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_tee2:out2'
-			xlink:to='w11a_r_tee2:process:out2' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_header_decode' xlink:label='w11a_r_header_decode'>
-		<id>w11a_r_header_decode</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_header_decode:in'
-			xlink:label='w11a_r_header_decode:in'>
-			<id>in</id>
-			<type>ofdm_symbol_softbits_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_header_decode:out'
-			xlink:label='w11a_r_header_decode:out'>
-			<id>out</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_header_decode:process'
-			xlink:label='w11a_r_header_decode:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_header_decode:process:in'
-				xlink:label='w11a_r_header_decode:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_softbits_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_header_decode:process:out'
-				xlink:label='w11a_r_header_decode:process:out'>
-				<id>out</id>
-				<type>ofdm_symbol_hardbits_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_header_decode:in'
-			xlink:to='w11a_r_header_decode:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_header_decode:out'
-			xlink:to='w11a_r_header_decode:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_header_demode' xlink:label='w11a_r_header_demode'>
-		<id>w11a_r_header_demode</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_header_demode:in'
-			xlink:label='w11a_r_header_demode:in'>
-			<id>in</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_header_demode:out'
-			xlink:label='w11a_r_header_demode:out'>
-			<id>out</id>
-			<type>ofdm_symbol_softbits_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_header_demode:process'
-			xlink:label='w11a_r_header_demode:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_header_demode:process:in'
-				xlink:label='w11a_r_header_demode:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_waveform_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_header_demode:process:out'
-				xlink:label='w11a_r_header_demode:process:out'>
-				<id>out</id>
-				<type>ofdm_symbol_softbits_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_header_demode:in'
-			xlink:to='w11a_r_header_demode:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_header_demode:out'
-			xlink:to='w11a_r_header_demode:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_payload_decode'
-		xlink:label='w11a_r_payload_decode'>
-		<id>w11a_r_payload_decode</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_payload_decode:in'
-			xlink:label='w11a_r_payload_decode:in'>
-			<id>in</id>
-			<type>ofdm_symbol_softbits_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_payload_decode:out'
-			xlink:label='w11a_r_payload_decode:out'>
-			<id>out</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_payload_decode:process'
-			xlink:label='w11a_r_payload_decode:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_payload_decode:process:in'
-				xlink:label='w11a_r_payload_decode:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_softbits_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_payload_decode:process:out'
-				xlink:label='w11a_r_payload_decode:process:out'>
-				<id>out</id>
-				<type>ofdm_symbol_hardbits_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_payload_decode:in'
-			xlink:to='w11a_r_payload_decode:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_payload_decode:out'
-			xlink:to='w11a_r_payload_decode:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_payload_demode'
-		xlink:label='w11a_r_payload_demode'>
-		<id>w11a_r_payload_demode</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_payload_demode:in'
-			xlink:label='w11a_r_payload_demode:in'>
-			<id>in</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_payload_demode:out'
-			xlink:label='w11a_r_payload_demode:out'>
-			<id>out</id>
-			<type>ofdm_symbol_softbits_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_payload_demode:process'
-			xlink:label='w11a_r_payload_demode:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_payload_demode:process:in'
-				xlink:label='w11a_r_payload_demode:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_waveform_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_payload_demode:process:out'
-				xlink:label='w11a_r_payload_demode:process:out'>
-				<id>out</id>
-				<type>ofdm_symbol_softbits_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_payload_demode:in'
-			xlink:to='w11a_r_payload_demode:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_payload_demode:out'
-			xlink:to='w11a_r_payload_demode:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_phy_header_analysis'
-		xlink:label='w11a_r_phy_header_analysis'>
-		<id>w11a_r_phy_header_analysis</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_phy_header_analysis:in'
-			xlink:label='w11a_r_phy_header_analysis:in'>
-			<id>in</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_phy_header_analysis:out'
-			xlink:label='w11a_r_phy_header_analysis:out'>
-			<id>out</id>
-			<type>uint8_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_phy_header_analysis:process'
-			xlink:label='w11a_r_phy_header_analysis:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_phy_header_analysis:process:in'
-				xlink:label='w11a_r_phy_header_analysis:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_hardbits_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_phy_header_analysis:process:out'
-				xlink:label='w11a_r_phy_header_analysis:process:out'>
-				<id>out</id>
-				<type>uint8_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_phy_header_analysis:in'
-			xlink:to='w11a_r_phy_header_analysis:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_phy_header_analysis:out'
-			xlink:to='w11a_r_phy_header_analysis:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_crc' xlink:label='w11a_r_crc'>
-		<id>w11a_r_crc</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_crc:in' xlink:label='w11a_r_crc:in'>
-			<id>in</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_crc:out' xlink:label='w11a_r_crc:out'>
-			<id>out</id>
-			<type>bool</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_crc:process' xlink:label='w11a_r_crc:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_crc:process:in'
-				xlink:label='w11a_r_crc:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_waveform_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_crc:process:out'
-				xlink:label='w11a_r_crc:process:out'>
-				<id>out</id>
-				<type>bool</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_crc:in'
-			xlink:to='w11a_r_crc:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_crc:out'
-			xlink:to='w11a_r_crc:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_blackhole' xlink:label='w11a_r_blackhole'>
-		<id>w11a_r_blackhole</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_blackhole:in' xlink:label='w11a_r_blackhole:in'>
-			<id>in</id>
-			<type>w11a_r_mode_tag_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_blackhole:process'
-			xlink:label='w11a_r_blackhole:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_blackhole:process:in'
-				xlink:label='w11a_r_blackhole:process:in'>
-				<id>in</id>
-				<type>w11a_r_mode_tag_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_blackhole:in'
-			xlink:to='w11a_r_blackhole:process:in' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_wormhole' xlink:label='w11a_r_wormhole'>
-		<id>w11a_r_wormhole</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_wormhole:out' xlink:label='w11a_r_wormhole:out'>
-			<id>out</id>
-			<type>bool</type>
-			<size>0</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_wormhole:process'
-			xlink:label='w11a_r_wormhole:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_wormhole:process:out'
-				xlink:label='w11a_r_wormhole:process:out'>
-				<id>out</id>
-				<type>bool</type>
-				<size>0</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_wormhole:out'
-			xlink:to='w11a_r_wormhole:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_cfensync' xlink:label='w11a_r_cfensync'>
-		<id>w11a_r_cfensync</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_cfensync:in' xlink:label='w11a_r_cfensync:in'>
-			<id>in</id>
-			<type>ofdm_symbol_waveform_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_cfensync:out' xlink:label='w11a_r_cfensync:out'>
-			<id>out</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_cfensync:process'
-			xlink:label='w11a_r_cfensync:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_cfensync:process:in'
-				xlink:label='w11a_r_cfensync:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_waveform_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_cfensync:process:out'
-				xlink:label='w11a_r_cfensync:process:out'>
-				<id>out</id>
-				<type>ofdm_symbol_hardbits_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_cfensync:in'
-			xlink:to='w11a_r_cfensync:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_cfensync:out'
-			xlink:to='w11a_r_cfensync:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_ffence' xlink:label='w11a_r_ffence'>
-		<id>w11a_r_ffence</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_ffence:outstate'
-			xlink:label='w11a_r_ffence:outstate'>
-			<id>outstate</id>
-			<type>uint16_t</type>
-			<size>1</size>
-		</port>
-		<port xlink:type='resource' id='w11a_r_ffence:in' xlink:label='w11a_r_ffence:in'>
-			<id>in</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_ffence:out' xlink:label='w11a_r_ffence:out'>
-			<id>out</id>
-			<type>w11a_r_syncstat_t</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_ffence:instate'
-			xlink:label='w11a_r_ffence:instate'>
-			<id>instate</id>
-			<type>uint16_t</type>
-			<size>1</size>
-			<const />
-		</port>
-		<node xlink:type='resource' id='w11a_r_ffence:ctor' xlink:label='w11a_r_ffence:ctor'>
-			<id>ctor</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_ffence:ctor:outstate'
-				xlink:label='w11a_r_ffence:ctor:outstate'>
-				<id>outstate</id>
-				<type>uint16_t</type>
-				<size>1</size>
-			</port>
-		</node>
-		<node xlink:type='resource' id='w11a_r_ffence:process'
-			xlink:label='w11a_r_ffence:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_ffence:process:in'
-				xlink:label='w11a_r_ffence:process:in'>
-				<id>in</id>
-				<type>ofdm_symbol_hardbits_t</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_ffence:process:out'
-				xlink:label='w11a_r_ffence:process:out'>
-				<id>out</id>
-				<type>w11a_r_syncstat_t</type>
-				<size>1</size>
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_ffence:process:instate'
-				xlink:label='w11a_r_ffence:process:instate'>
-				<id>instate</id>
-				<type>uint16_t</type>
-				<size>1</size>
-				<const />
-			</port>
-			<port xlink:type='resource' id='w11a_r_ffence:process:outstate'
-				xlink:label='w11a_r_ffence:process:outstate'>
-				<id>outstate</id>
-				<type>uint16_t</type>
-				<size>1</size>
-			</port>
-		</node>
-		<node xlink:type='resource' id='w11a_r_ffence:dtor' xlink:label='w11a_r_ffence:dtor'>
-			<id>dtor</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_ffence:dtor:instate'
-				xlink:label='w11a_r_ffence:dtor:instate'>
-				<id>instate</id>
-				<type>uint16_t</type>
-				<size>1</size>
-				<const />
-			</port>
-		</node>
-		<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:process:outstate'
-			xlink:href='#w11a_r_ffence:process:outstate' />
-		<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:dtor:instate'
-			xlink:href='#w11a_r_ffence:dtor:instate' />
-		<edge xlink:type='arc' xlink:from='w11a_r_ffence:process:outstate'
-			xlink:to='w11a_r_ffence:dtor:instate'>
-			<type>deinit_state</type>
-			<from>
-				<node id='w11a_r_ffence:::process'>
-					<id>process</id>
-					<port id='w11a_r_ffence:::process:outstate'>
-						<id>outstate</id>
-					</port>
-				</node>
-			</from>
-			<to>
-				<node id='w11a_r_ffence:::dtor'>
-					<id>dtor</id>
-					<port id='w11a_r_ffence:::dtor:instate'>
-						<id>instate</id>
-					</port>
-				</node>
-			</to>
-		</edge>
-		<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:ctor:outstate'
-			xlink:href='#w11a_r_ffence:ctor:outstate' />
-		<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:process:instate'
-			xlink:href='#w11a_r_ffence:process:instate' />
-		<edge xlink:type='arc' xlink:from='w11a_r_ffence:ctor:outstate'
-			xlink:to='w11a_r_ffence:process:instate'>
-			<type>init_state</type>
-			<from>
-				<node id='w11a_r_ffence:::ctor'>
-					<id>ctor</id>
-					<port id='w11a_r_ffence:::ctor:outstate'>
-						<id>outstate</id>
-					</port>
-				</node>
-			</from>
-			<to>
-				<node id='w11a_r_ffence:::process'>
-					<id>process</id>
-					<port id='w11a_r_ffence:::process:instate'>
-						<id>instate</id>
-					</port>
-				</node>
-			</to>
-		</edge>
-		<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:process:outstate'
-			xlink:href='#w11a_r_ffence:process:outstate' />
-		<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:process:instate'
-			xlink:href='#w11a_r_ffence:process:instate' />
-		<edge xlink:type='arc' xlink:from='w11a_r_ffence:process:outstate'
-			xlink:to='w11a_r_ffence:process:instate'>
-			<type>state</type>
-			<from>
-				<node id='w11a_r_ffence:::process'>
-					<id>process</id>
-					<port id='w11a_r_ffence:::process:outstate'>
-						<id>outstate</id>
-					</port>
-				</node>
-			</from>
-			<to>
-				<node id='w11a_r_ffence:::process'>
-					<id>process</id>
-					<port id='w11a_r_ffence:::process:instate'>
-						<id>instate</id>
-					</port>
-				</node>
-			</to>
-		</edge>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_ffence:in'
-			xlink:to='w11a_r_ffence:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_ffence:out'
-			xlink:to='w11a_r_ffence:process:out' />
-	</node>
-	<node xlink:type='resource' id='w11a_r_bool_tee' xlink:label='w11a_r_bool_tee'>
-		<id>w11a_r_bool_tee</id>
-		<type>strict unfold</type>
-		<port xlink:type='resource' id='w11a_r_bool_tee:in' xlink:label='w11a_r_bool_tee:in'>
-			<id>in</id>
-			<type>bool</type>
-			<size>1</size>
-			<const />
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_bool_tee:out1'
-			xlink:label='w11a_r_bool_tee:out1'>
-			<id>out1</id>
-			<type>bool</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<port xlink:type='resource' id='w11a_r_bool_tee:out2'
-			xlink:label='w11a_r_bool_tee:out2'>
-			<id>out2</id>
-			<type>bool</type>
-			<size>1</size>
-			<restrict />
-		</port>
-		<node xlink:type='resource' id='w11a_r_bool_tee:process'
-			xlink:label='w11a_r_bool_tee:process'>
-			<id>process</id>
-			<type>strict unfold</type>
-			<ret>void</ret>
-			<port xlink:type='resource' id='w11a_r_bool_tee:process:in'
-				xlink:label='w11a_r_bool_tee:process:in'>
-				<id>in</id>
-				<type>bool</type>
-				<size>1</size>
-				<const />
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_bool_tee:process:out1'
-				xlink:label='w11a_r_bool_tee:process:out1'>
-				<id>out1</id>
-				<type>bool</type>
-				<size>1</size>
-				<restrict />
-			</port>
-			<port xlink:type='resource' id='w11a_r_bool_tee:process:out2'
-				xlink:label='w11a_r_bool_tee:process:out2'>
-				<id>out2</id>
-				<type>bool</type>
-				<size>1</size>
-				<restrict />
-			</port>
-		</node>
-		<bound-to xlink:type='arc' xlink:from='w11a_r_bool_tee:in'
-			xlink:to='w11a_r_bool_tee:process:in' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_bool_tee:out1'
-			xlink:to='w11a_r_bool_tee:process:out1' />
-		<bound-to xlink:type='arc' xlink:from='w11a_r_bool_tee:out2'
-			xlink:to='w11a_r_bool_tee:process:out2' />
-	</node>
-	<endpoint xlink:type='locator' xlink:label='w11a_r_source:out'
-		xlink:href='w11a_r.gxf#w11a_r_source:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_source:in'
-		xlink:href='w11a_r.gxf#w11a_r_source:in' />
-	<end xlink:type='locator' xlink:label='w11a_r_foo' xlink:href='w11a_r.gxf#w11a_r_switch:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_mc:out'
-		xlink:href='w11a_r.gxf#w11a_r_mc:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_tee2:in'
-		xlink:href='w11a_r.gxf#w11a_r_tee2:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_tee2:out1'
-		xlink:href='w11a_r.gxf#w11a_r_tee2:out1' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_switch:tag'
-		xlink:href='w11a_r.gxf#w11a_r_switch:tag' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_tee2:out2'
-		xlink:href='w11a_r.gxf#w11a_r_tee2:out2' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_select:in_tag'
-		xlink:href='w11a_r.gxf#w11a_r_select:in_tag' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_switch:synch_buf'
-		xlink:href='w11a_r.gxf#w11a_r_switch:synch_buf' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_sync:in'
-		xlink:href='w11a_r.gxf#w11a_r_sync:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_switch:header_buf'
-		xlink:href='w11a_r.gxf#w11a_r_switch:header_buf' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_header:in'
-		xlink:href='w11a_r.gxf#w11a_r_header:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_switch:payload_buf'
-		xlink:href='w11a_r.gxf#w11a_r_switch:payload_buf' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_payload:in'
-		xlink:href='w11a_r.gxf#w11a_r_payload:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_switch:crc_buf'
-		xlink:href='w11a_r.gxf#w11a_r_switch:crc_buf' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_crc:in'
-		xlink:href='w11a_r.gxf#w11a_r_crc:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_switch:out_tag'
-		xlink:href='w11a_r.gxf#w11a_r_switch:out_tag' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_blackhole:in'
-		xlink:href='w11a_r.gxf#w11a_r_blackhole:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_sync:out'
-		xlink:href='w11a_r.gxf#w11a_r_sync:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_select:synch_stat'
-		xlink:href='w11a_r.gxf#w11a_r_select:synch_stat' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_header:out'
-		xlink:href='w11a_r.gxf#w11a_r_header:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_select:header_stat'
-		xlink:href='w11a_r.gxf#w11a_r_select:header_stat' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_crc:out'
-		xlink:href='w11a_r.gxf#w11a_r_crc:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_select:crc_stat'
-		xlink:href='w11a_r.gxf#w11a_r_select:crc_stat' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_wormhole:out'
-		xlink:href='w11a_r.gxf#w11a_r_wormhole:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_select:payload_stat'
-		xlink:href='w11a_r.gxf#w11a_r_select:payload_stat' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_select:pack'
-		xlink:href='w11a_r.gxf#w11a_r_select:pack' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_mc:in'
-		xlink:href='w11a_r.gxf#w11a_r_mc:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_mcdelay:out'
-		xlink:href='w11a_r.gxf#w11a_r_mcdelay:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:in'
-		xlink:href='w11a_r.gxf#w11a_r_ffence:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_ffence:out'
-		xlink:href='w11a_r.gxf#w11a_r_ffence:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_cfensync:in'
-		xlink:href='w11a_r.gxf#w11a_r_cfensync:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_cfensync:out'
-		xlink:href='w11a_r.gxf#w11a_r_cfensync:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_phy_header_analysis:in'
-		xlink:href='w11a_r.gxf#w11a_r_phy_header_analysis:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_phy_header_analysis:out'
-		xlink:href='w11a_r.gxf#w11a_r_phy_header_analysis:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_payload_demode:in'
-		xlink:href='w11a_r.gxf#w11a_r_payload_demode:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_payload_demode:out'
-		xlink:href='w11a_r.gxf#w11a_r_payload_demode:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_payload_decode:in'
-		xlink:href='w11a_r.gxf#w11a_r_payload_decode:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_payload_decode:out'
-		xlink:href='w11a_r.gxf#w11a_r_payload_decode:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_header_demode:in'
-		xlink:href='w11a_r.gxf#w11a_r_header_demode:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_header_demode:out'
-		xlink:href='w11a_r.gxf#w11a_r_header_demode:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_header_decode:in'
-		xlink:href='w11a_r.gxf#w11a_r_header_decode:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_header_decode:out'
-		xlink:href='w11a_r.gxf#w11a_r_header_decode:out' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_bool_tee:in'
-		xlink:href='w11a_r.gxf#w11a_r_bool_tee:in' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_bool_tee:out1'
-		xlink:href='w11a_r.gxf#w11a_r_bool_tee:out1' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_bool_tee:out2'
-		xlink:href='w11a_r.gxf#w11a_r_bool_tee:out2' />
-	<edge id='0' xlink:type='arc' xlink:from='w11a_r_source:out'
-		xlink:to='w11a_r_foo'>
-		<id>0</id>
-		<type>fifo</type>
-		<from>
-			<node id='0::w11a_r_source'>
-				<id>w11a_r_source</id>
-				<port id='0::w11a_r_source:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='0::w11a_r_switch'>
-				<id>w11a_r_switch</id>
-				<port id='0::w11a_r_switch:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='1' xlink:type='arc' xlink:from='w11a_r_mc:out' xlink:to='w11a_r_tee2:in'>
-		<id>1</id>
-		<type>fifo</type>
-		<from>
-			<node id='1::w11a_r_mc'>
-				<id>w11a_r_mc</id>
-				<port id='1::w11a_r_mc:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='1::w11a_r_tee2'>
-				<id>w11a_r_tee2</id>
-				<port id='1::w11a_r_tee2:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='2' xlink:type='arc' xlink:from='w11a_r_tee2:out1'
-		xlink:to='w11a_r_switch:tag'>
-		<id>2</id>
-		<type>fifo</type>
-		<from>
-			<node id='2::w11a_r_tee2'>
-				<id>w11a_r_tee2</id>
-				<port id='2::w11a_r_tee2:out1'>
-					<id>out1</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='2::w11a_r_switch'>
-				<id>w11a_r_switch</id>
-				<port id='2::w11a_r_switch:tag'>
-					<id>tag</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='3' xlink:type='arc' xlink:from='w11a_r_tee2:out2'
-		xlink:to='w11a_r_select:in_tag'>
-		<id>3</id>
-		<type>fifo</type>
-		<from>
-			<node id='3::w11a_r_tee2'>
-				<id>w11a_r_tee2</id>
-				<port id='3::w11a_r_tee2:out2'>
-					<id>out2</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='3::w11a_r_select'>
-				<id>w11a_r_select</id>
-				<port id='3::w11a_r_select:in_tag'>
-					<id>in_tag</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='4' xlink:type='arc' xlink:from='w11a_r_switch:synch_buf'
-		xlink:to='w11a_r_cfensync:in'>
-		<id>4</id>
-		<type>fifo</type>
-		<from>
-			<node id='4::w11a_r_switch'>
-				<id>w11a_r_switch</id>
-				<port id='4::w11a_r_switch:synch_buf'>
-					<id>synch_buf</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='4::w11a_r_cfensync'>
-				<id>w11a_r_cfensync</id>
-				<port id='4::w11a_r_cfensync:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='5' xlink:type='arc' xlink:from='w11a_r_switch:header_buf'
-		xlink:to='w11a_r_header_demode:in'>
-		<id>5</id>
-		<type>fifo</type>
-		<from>
-			<node id='5::w11a_r_switch'>
-				<id>w11a_r_switch</id>
-				<port id='5::w11a_r_switch:header_buf'>
-					<id>header_buf</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='5::w11a_r_header_demode'>
-				<id>w11a_r_header_demode</id>
-				<port id='5::w11a_r_header_demode:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='6' xlink:type='arc' xlink:from='w11a_r_switch:payload_buf'
-		xlink:to='w11a_r_payload_demode:in'>
-		<id>6</id>
-		<type>fifo</type>
-		<from>
-			<node id='6::w11a_r_switch'>
-				<id>w11a_r_switch</id>
-				<port id='6::w11a_r_switch:payload_buf'>
-					<id>payload_buf</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='6::w11a_r_payload_demode'>
-				<id>w11a_r_payload_demode</id>
-				<port id='6::w11a_r_payload_demode:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='7' xlink:type='arc' xlink:from='w11a_r_header_demode:out'
-		xlink:to='w11a_r_header_decode:in'>
-		<id>7</id>
-		<type>fifo</type>
-		<from>
-			<node id='7::w11a_r_header_demode'>
-				<id>w11a_r_header_demode</id>
-				<port id='7::w11a_r_header_demode:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='7::w11a_r_header_decode'>
-				<id>w11a_r_header_decode</id>
-				<port id='7::w11a_r_header_decode:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='8' xlink:type='arc' xlink:from='w11a_r_header_decode:out'
-		xlink:to='w11a_r_phy_header_analysis:in'>
-		<id>8</id>
-		<type>fifo</type>
-		<from>
-			<node id='8::w11a_r_header_decode'>
-				<id>w11a_r_header_decode</id>
-				<port id='8::w11a_r_header_decode:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='8::w11a_r_phy_header_analysis'>
-				<id>w11a_r_phy_header_analysis</id>
-				<port id='8::w11a_r_phy_header_analysis:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='9' xlink:type='arc' xlink:from='w11a_r_payload_demode:out'
-		xlink:to='w11a_r_payload_decode:in'>
-		<id>9</id>
-		<type>fifo</type>
-		<from>
-			<node id='9::w11a_r_payload_demode'>
-				<id>w11a_r_payload_demode</id>
-				<port id='9::w11a_r_payload_demode:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='9::w11a_r_payload_decode'>
-				<id>w11a_r_payload_decode</id>
-				<port id='9::w11a_r_payload_decode:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='10' xlink:type='arc' xlink:from='w11a_r_cfensync:out'
-		xlink:to='w11a_r_ffence:in'>
-		<id>10</id>
-		<type>fifo</type>
-		<from>
-			<node id='10::w11a_r_cfensync'>
-				<id>w11a_r_cfensync</id>
-				<port id='10::w11a_r_cfensync:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='10::w11a_r_ffence'>
-				<id>w11a_r_ffence</id>
-				<port id='10::w11a_r_ffence:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='11' xlink:type='arc' xlink:from='w11a_r_switch:crc_buf'
-		xlink:to='w11a_r_crc:in'>
-		<id>11</id>
-		<type>fifo</type>
-		<from>
-			<node id='11::w11a_r_switch'>
-				<id>w11a_r_switch</id>
-				<port id='11::w11a_r_switch:crc_buf'>
-					<id>crc_buf</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='11::w11a_r_crc'>
-				<id>w11a_r_crc</id>
-				<port id='11::w11a_r_crc:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='12' xlink:type='arc' xlink:from='w11a_r_switch:out_tag'
-		xlink:to='w11a_r_blackhole:in'>
-		<id>12</id>
-		<type>fifo</type>
-		<from>
-			<node id='12::w11a_r_switch'>
-				<id>w11a_r_switch</id>
-				<port id='12::w11a_r_switch:out_tag'>
-					<id>out_tag</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='12::w11a_r_blackhole'>
-				<id>w11a_r_blackhole</id>
-				<port id='12::w11a_r_blackhole:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='13' xlink:type='arc' xlink:from='w11a_r_ffence:out'
-		xlink:to='w11a_r_select:synch_stat'>
-		<id>13</id>
-		<type>fifo</type>
-		<from>
-			<node id='13::w11a_r_ffence'>
-				<id>w11a_r_ffence</id>
-				<port id='13::w11a_r_ffence:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='13::w11a_r_select'>
-				<id>w11a_r_select</id>
-				<port id='13::w11a_r_select:synch_stat'>
-					<id>synch_stat</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='14' xlink:type='arc' xlink:from='w11a_r_phy_header_analysis:out'
-		xlink:to='w11a_r_select:header_stat'>
-		<id>14</id>
-		<type>fifo</type>
-		<from>
-			<node id='14::w11a_r_phy_header_analysis'>
-				<id>w11a_r_phy_header_analysis</id>
-				<port id='14::w11a_r_phy_header_analysis:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='14::w11a_r_select'>
-				<id>w11a_r_select</id>
-				<port id='14::w11a_r_select:header_stat'>
-					<id>header_stat</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='15' xlink:type='arc' xlink:from='w11a_r_wormhole:out'
-		xlink:to='w11a_r_select:payload_stat'>
-		<id>15</id>
-		<type>fifo</type>
-		<from>
-			<node id='15::w11a_r_wormhole'>
-				<id>w11a_r_wormhole</id>
-				<port id='15::w11a_r_wormhole:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='15::w11a_r_select'>
-				<id>w11a_r_select</id>
-				<port id='15::w11a_r_select:payload_stat'>
-					<id>payload_stat</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='16' xlink:type='arc' xlink:from='w11a_r_select:pack'
-		xlink:to='w11a_r_mc:in'>
-		<id>16</id>
-		<type>fifo</type>
-		<from>
-			<node id='16::w11a_r_select'>
-				<id>w11a_r_select</id>
-				<port id='16::w11a_r_select:pack'>
-					<id>pack</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='16::w11a_r_mc'>
-				<id>w11a_r_mc</id>
-				<port id='16::w11a_r_mc:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='_' xlink:type='arc' xlink:from='w11a_r_mcdelay:out'
-		xlink:to='w11a_r_mc:in'>
-		<id>_</id>
-		<type>init_fifo</type>
-		<from>
-			<node id='_::w11a_r_mcdelay'>
-				<id>w11a_r_mcdelay</id>
-				<port id='_::w11a_r_mcdelay:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='_::w11a_r_mc'>
-				<id>w11a_r_mc</id>
-				<port id='_::w11a_r_mc:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<type xlink:type='locator' xlink:label='extern' xlink:href='core.xml#EXTERN' />
-	<node id='w11a_r_crc_stat' xlink:type='resource' xlink:label='w11a_r_crc_stat'>
-		<id>w11a_r_crc_stat</id>
-		<type>extern</type>
-		<port id='w11a_r_crc_stat:in'>
-			<id>in</id>
-			<type>bool</type>
-			<size>1</size>
-			<const />
-		</port>
-	</node>
-	<inst-is xlink:type='arc' xlink:from='extern' xlink:to='w11a_r_crc_stat' />
-	<type-is xlink:type='arc' xlink:from='w11a_r_crc_stat'
-		xlink:to='extern' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_crc_stat:in'
-		xlink:href='w11a_r.gxf#w11a_r_crc_stat:in' />
-	<edge id='17' xlink:type='arc' xlink:from='w11a_r_crc:out'
-		xlink:to='w11a_r_bool_tee:in'>
-		<id>17</id>
-		<type>fifo</type>
-		<from>
-			<node id='17::w11a_r_crc'>
-				<id>w11a_r_crc</id>
-				<port id='17::w11a_r_crc:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='17::w11a_r_bool_tee'>
-				<id>w11a_r_bool_tee</id>
-				<port id='17::w11a_r_bool_tee:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='18' xlink:type='arc' xlink:from='w11a_r_bool_tee:out1'
-		xlink:to='w11a_r_crc_stat:in'>
-		<id>18</id>
-		<type>fifo</type>
-		<from>
-			<node id='18::w11a_r_bool_tee'>
-				<id>w11a_r_bool_tee</id>
-				<port id='18::w11a_r_bool_tee:out1'>
-					<id>out1</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='18::w11a_r_crc_stat'>
-				<id>w11a_r_crc_stat</id>
-				<port id='18::w11a_r_crc_stat:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<edge id='19' xlink:type='arc' xlink:from='w11a_r_bool_tee:out2'
-		xlink:to='w11a_r_select:crc_stat'>
-		<id>19</id>
-		<type>fifo</type>
-		<from>
-			<node id='19::w11a_r_bool_tee'>
-				<id>w11a_r_bool_tee</id>
-				<port id='19::w11a_r_bool_tee:out2'>
-					<id>out2</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='19::w11a_r_select'>
-				<id>w11a_r_select</id>
-				<port id='19::w11a_r_select:crc_stat'>
-					<id>crc_stat</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<node id='w11a_r_data_in' xlink:type='resource' xlink:label='w11a_r_data_in'>
-		<id>w11a_r_data_in</id>
-		<type>extern</type>
-		<port id='w11a_r_data_in:out'>
-			<id>out</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-		</port>
-	</node>
-	<inst-is xlink:type='arc' xlink:from='extern' xlink:to='w11a_r_data_in' />
-	<type-is xlink:type='arc' xlink:from='w11a_r_data_in' xlink:to='extern' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_data_in:out'
-		xlink:href='w11a_r.gxf#w11a_r_data_in:out' />
-	<edge id='20' xlink:type='arc' xlink:from='w11a_r_data_in:out'
-		xlink:to='w11a_r_source:in'>
-		<id>20</id>
-		<type>fifo</type>
-		<from>
-			<node id='20::w11a_r_data_in'>
-				<id>w11a_r_data_in</id>
-				<port id='20::w11a_r_data_in:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='20::w11a_r_source'>
-				<id>w11a_r_source</id>
-				<port id='20::w11a_r_source:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-	<node id='w11a_r_data_out' xlink:type='resource' xlink:label='w11a_r_data_out'>
-		<id>w11a_r_data_out</id>
-		<type>extern</type>
-		<port id='w11a_r_data_out:in'>
-			<id>in</id>
-			<type>ofdm_symbol_hardbits_t</type>
-			<size>1</size>
-			<const />
-		</port>
-	</node>
-	<inst-is xlink:type='arc' xlink:from='extern' xlink:to='w11a_r_data_out' />
-	<type-is xlink:type='arc' xlink:from='w11a_r_data_out'
-		xlink:to='extern' />
-	<endpoint xlink:type='locator' xlink:label='w11a_r_data_out:in'
-		xlink:href='w11a_r.gxf#w11a_r_data_out:in' />
-	<edge id='21' xlink:type='arc' xlink:from='w11a_r_payload_decode:out'
-		xlink:to='w11a_r_data_out:in'>
-		<id>21</id>
-		<type>fifo</type>
-		<from>
-			<node id='21::w11a_r_payload_decode'>
-				<id>w11a_r_payload_decode</id>
-				<port id='21::w11a_r_payload_decode:out'>
-					<id>out</id>
-				</port>
-			</node>
-		</from>
-		<to>
-			<node id='21::w11a_r_data_out'>
-				<id>w11a_r_data_out</id>
-				<port id='21::w11a_r_data_out:in'>
-					<id>in</id>
-				</port>
-			</node>
-		</to>
-	</edge>
-</gxf>

File src/nl/tudelft/lime/LimeEditor.java

 import java.io.InputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.EventObject;
 import java.util.List;
 import nl.tudelft.lime.dnd.TextTransferDropTargetListener;
 import nl.tudelft.lime.edit.GraphicalPartFactory;
 import nl.tudelft.lime.edit.TreePartFactory;
-import nl.tudelft.lime.model.LimeDiagram;
 import nl.tudelft.lime.model.LimeRuler;
+import nl.tudelft.lime.model.component.LimeDiagram;
 import nl.tudelft.lime.palette.LimePaletteCustomizer;
 import nl.tudelft.lime.rulers.LimeRulerProvider;
 import nl.tudelft.lime.xml.XMLFactory;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IResourceDeltaVisitor;
 import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.draw2d.FigureCanvas;
 import org.eclipse.draw2d.LightweightSystem;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.part.PageBook;
      * based on if the file is opened in the workspace or outside the workspace, creates a
      * file
      */
-    private IFile getFile(IEditorInput input) {
+/*    private IFile getFile(IEditorInput input) {
         IFile file = null;
 
         if (input instanceof IFileEditorInput) {
         }
 
         return file;
-    }
+    }*/
 
     protected void closeEditor(boolean save) {
         getSite().getPage().closeEditor(LimeEditor.this, save);
                     setLimeDiagram(XMLFactory.getDiagramForXML(is));
                 } catch (Exception e) {
                     setLimeDiagram(new LimeDiagram());
-                    System.out.println(e.getMessage());
+                    e.printStackTrace();
                 }
 
                 is.close();

File src/nl/tudelft/lime/LimePlugin.java

 
 import nl.tudelft.lime.constants.LimeMessages;
 import nl.tudelft.lime.constants.SystemSettings;
-import nl.tudelft.lime.model.LimeCodeFragment;
-import nl.tudelft.lime.model.arc.Arc;
-import nl.tudelft.lime.model.arc.Association;
+import nl.tudelft.lime.model.codefragment.LimeCodeFragment;
 import nl.tudelft.lime.model.component.LimeComponent;
+import nl.tudelft.lime.model.connection.Arc;
+import nl.tudelft.lime.model.connection.Association;
 import nl.tudelft.lime.model.port.InputPort;
 import nl.tudelft.lime.model.port.OutputPort;
 

File src/nl/tudelft/lime/LimeWizardPage.java

 import java.io.InputStream;
 
 import nl.tudelft.lime.constants.LimeMessages;
-import nl.tudelft.lime.model.LimeDiagram;
+import nl.tudelft.lime.model.component.LimeDiagram;
 import nl.tudelft.lime.xml.XMLFactory;
 
 import org.eclipse.core.resources.IFile;

File src/nl/tudelft/lime/actions/FlyoutChangeLayoutAction.java

 package nl.tudelft.lime.actions;
 
 import nl.tudelft.lime.LimeEditor;
-import nl.tudelft.lime.model.LimeDiagram;
+import nl.tudelft.lime.model.component.LimeDiagram;
 
 import org.eclipse.jface.action.Action;
 

File src/nl/tudelft/lime/edit/GraphicalPartFactory.java

 import nl.tudelft.lime.edit.editpart.LimeDiagramEditPart;
 import nl.tudelft.lime.edit.editpart.LimeCodeFragmentEditPart;
 import nl.tudelft.lime.edit.editpart.PortEditPart;
-import nl.tudelft.lime.model.LimeDiagram;
-import nl.tudelft.lime.model.LimeCodeFragment;
-import nl.tudelft.lime.model.arc.Arc;
-import nl.tudelft.lime.model.arc.Association;
+import nl.tudelft.lime.model.codefragment.LimeCodeFragment;
 import nl.tudelft.lime.model.component.LimeComponent;
+import nl.tudelft.lime.model.component.LimeDiagram;
+import nl.tudelft.lime.model.connection.Arc;
+import nl.tudelft.lime.model.connection.Association;
 import nl.tudelft.lime.model.port.Port;
 
 import org.eclipse.gef.EditPart;

File src/nl/tudelft/lime/edit/TreePartFactory.java

 
 import nl.tudelft.lime.edit.editpart.LimeContainerTreeEditPart;
 import nl.tudelft.lime.edit.editpart.LimeTreeEditPart;
-import nl.tudelft.lime.model.LimeDiagram;
+import nl.tudelft.lime.model.component.LimeDiagram;
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartFactory;

File src/nl/tudelft/lime/edit/editpart/ArcEditPart.java

 package nl.tudelft.lime.edit.editpart;
 
-import nl.tudelft.lime.figures.ArcFigure;
 import nl.tudelft.lime.figures.FigureFactory;
-import nl.tudelft.lime.model.arc.Arc;
+import nl.tudelft.lime.figures.connection.ArcFigure;
+import nl.tudelft.lime.model.connection.Arc;
 
 import org.eclipse.draw2d.IFigure;
 

File src/nl/tudelft/lime/edit/editpart/AssociationEditPart.java

 package nl.tudelft.lime.edit.editpart;
 
 import nl.tudelft.lime.figures.FigureFactory;
-import nl.tudelft.lime.model.arc.Association;
+import nl.tudelft.lime.model.connection.Association;
 
 import org.eclipse.draw2d.IFigure;
 

File src/nl/tudelft/lime/edit/editpart/ComponentEditPart.java

 
 import nl.tudelft.lime.edit.policy.ContainerHighlightEditPolicy;
 import nl.tudelft.lime.edit.policy.LimeXYLayoutEditPolicy;
-import nl.tudelft.lime.figures.ComponentFigure;
 import nl.tudelft.lime.figures.FigureFactory;
+import nl.tudelft.lime.figures.component.ComponentFigure;
 
 import org.eclipse.draw2d.ConnectionAnchor;
 import org.eclipse.draw2d.IFigure;

File src/nl/tudelft/lime/edit/editpart/ConnectionEditPart.java

 import nl.tudelft.lime.edit.policy.ArcBendpointEditPolicy;
 import nl.tudelft.lime.edit.policy.ArcEditPolicy;
 import nl.tudelft.lime.edit.policy.ConnectionWhileEditingEditPolicy;
-import nl.tudelft.lime.model.arc.ArcBendpoint;
-import nl.tudelft.lime.model.arc.Connection;
+import nl.tudelft.lime.model.connection.ArcBendpoint;
+import nl.tudelft.lime.model.connection.Connection;
 
 import org.eclipse.draw2d.ManhattanConnectionRouter;
 import org.eclipse.draw2d.RelativeBendpoint;

File src/nl/tudelft/lime/edit/editpart/LimeCodeFragmentEditPart.java

 import nl.tudelft.lime.edit.policy.CodeFragmentDirectEditPolicy;
 import nl.tudelft.lime.edit.policy.CodeFragmentEditPolicy;
 import nl.tudelft.lime.figures.StickyNoteFigure;
-import nl.tudelft.lime.model.LimeCodeFragment;
+import nl.tudelft.lime.model.codefragment.LimeCodeFragment;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;

File src/nl/tudelft/lime/edit/editpart/LimeContainerEditPart.java

 package nl.tudelft.lime.edit.editpart;
 
 import nl.tudelft.lime.edit.policy.LimeContainerEditPolicy;
-import nl.tudelft.lime.model.LimeDiagram;
+import nl.tudelft.lime.model.component.LimeDiagram;
 
 import org.eclipse.gef.AccessibleEditPart;
 import org.eclipse.gef.EditPolicy;

File src/nl/tudelft/lime/edit/editpart/LimeContainerTreeEditPart.java

 
 import nl.tudelft.lime.edit.policy.LimeContainerEditPolicy;
 import nl.tudelft.lime.edit.policy.LimeTreeContainerEditPolicy;
-import nl.tudelft.lime.model.LimeDiagram;
+import nl.tudelft.lime.model.component.LimeDiagram;
 
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.RootEditPart;

File src/nl/tudelft/lime/edit/editpart/LimeDiagramEditPart.java

 import nl.tudelft.lime.layout.DelegatingLayoutManager;
 import nl.tudelft.lime.layout.GraphAnimation;
 import nl.tudelft.lime.layout.GraphLayoutManager;
-import nl.tudelft.lime.model.LimeDiagram;
 import nl.tudelft.lime.model.LimeSubpart;
+import nl.tudelft.lime.model.component.LimeDiagram;
 
 import org.eclipse.draw2d.Animation;
 import org.eclipse.draw2d.AutomaticRouter;

File src/nl/tudelft/lime/edit/editpart/LimeEditPart.java

 import nl.tudelft.lime.edit.policy.LimeNodeEditPolicy;
 import nl.tudelft.lime.figures.NodeFigure;
 import nl.tudelft.lime.model.LimeSubpart;
-import nl.tudelft.lime.model.arc.Connection;
+import nl.tudelft.lime.model.connection.Connection;
 
 import org.eclipse.draw2d.ConnectionAnchor;
 import org.eclipse.draw2d.geometry.Dimension;

File src/nl/tudelft/lime/edit/editpart/LimeTreeEditPart.java

 
 import nl.tudelft.lime.edit.policy.ElementEditPolicy;
 import nl.tudelft.lime.edit.policy.LimeTreeEditPolicy;
-import nl.tudelft.lime.model.LimeDiagram;
 import nl.tudelft.lime.model.LimeSubpart;
+import nl.tudelft.lime.model.component.LimeDiagram;
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPolicy;

File src/nl/tudelft/lime/edit/policy/ArcBendpointEditPolicy.java

 package nl.tudelft.lime.edit.policy;
 
-import nl.tudelft.lime.model.arc.Arc;
 import nl.tudelft.lime.model.commands.BendpointCommand;
 import nl.tudelft.lime.model.commands.CreateBendpointCommand;
 import nl.tudelft.lime.model.commands.DeleteBendpointCommand;
 import nl.tudelft.lime.model.commands.MoveBendpointCommand;
+import nl.tudelft.lime.model.connection.Arc;
 
 import org.eclipse.draw2d.Connection;
 import org.eclipse.draw2d.geometry.Point;