plus

3

--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1,5 +1,6 @@
 #include "sdlclass.h"
 
+SDL_Event event;
 
 bool sdl::init(){
   bool ok = true;
@@ -18,4 +19,16 @@ bool sdl::clear(){
 
 bool sdl::quit(){
   SDL_Quit();	
+}
+
+sdl::sdl(){
+  sdl::close = false;
+}
+
+void sdl::control(){
+  while(SDL_PollEvent(&event))
+  {
+    SDL_PumpEvents();
+  }
+  if(event.type == SDL_QUIT) sdl::close = true;
 }
\ No newline at end of file
plus

97

--- a/src/plumbing/transcoding.c
+++ b/src/plumbing/transcoding.c
@@ -775,8 +775,15 @@ transcoder_stream_audio(transcoder_t *t, transcoder_stream_t *ts, th_pkt_t *pkt)
 }
 
 /**
- *
+ * Parse MPEG2 header, simplifier version (we know what ffmpeg/libav generates
  */
+static inline uint32_t
+RB32(const uint8_t *d)
+{
+  return (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
+}
+
+
 static void
 extract_mpeg2_global_data(th_pkt_t *n, uint8_t *data, int len)
 {
@@ -799,43 +806,39 @@ non intra quantizer matrix		0 or 64*8
 
 Minimal of 12 bytes.
 */
-  uint32_t *mpeg2_header = (uint32_t *)data;
-  if (*mpeg2_header == 0xb3010000) {  // SEQ_START_CODE
-    // Need to determine lentgh of header.
+  int hs = 12;
 
-    int header_size = 12;
+  if (len >= hs && RB32(data) == 0x000001b3) {  // SEQ_START_CODE
 
     // load intra quantizer matrix
-    uint8_t matrix_enabled = (((uint8_t)*(data+(header_size-1)) & 0x02) == 0x02);
-    if (matrix_enabled) 
-      header_size += 64;
+    if (data[hs-1] & 0x02) {
+      if (hs + 64 < len) return;
+      hs += 64;
+    }
 
-    //load non intra quantizer matrix
-    matrix_enabled = (((uint8_t)*(data+(header_size-1)) & 0x01) == 0x01);
-    if (matrix_enabled)
-      header_size += 64;
+    // load non intra quantizer matrix
+    if (data[hs-1] & 0x01) {
+      if (hs + 64 < len) return;
+      hs += 64;
+    }
 
     // See if we have the first EXT_START_CODE. Normally 10 bytes
     // https://git.libav.org/?p=libav.git;a=blob;f=libavcodec/mpeg12enc.c;h=3376f1075f4b7582a8e4556e98deddab3e049dab;hb=HEAD#l272
-    mpeg2_header = (uint32_t *)(data+(header_size));
-    if (*mpeg2_header == 0xb5010000) { // EXT_START_CODE
-      header_size += 10;
-
-      // See if we have the second EXT_START_CODE. Normally 12 bytes
-      // https://git.libav.org/?p=libav.git;a=blob;f=libavcodec/mpeg12enc.c;h=3376f1075f4b7582a8e4556e98deddab3e049dab;hb=HEAD#l291
-      mpeg2_header = (uint32_t *)(data+(header_size));
-      if (*mpeg2_header == 0xb5010000) { // EXT_START_CODE
-        header_size += 12;
-
-        // See if we have the second GOP_START_CODE. Normally 31 bits == 4 bytes
-        // https://git.libav.org/?p=libav.git;a=blob;f=libavcodec/mpeg12enc.c;h=3376f1075f4b7582a8e4556e98deddab3e049dab;hb=HEAD#l304
-        mpeg2_header = (uint32_t *)(data+(header_size));
-        if (*mpeg2_header == 0xb8010000) // GOP_START_CODE
-          header_size += 4;
-     }
-    }
+    if (hs + 10 <= len && RB32(data + hs) == 0x000001b5) // EXT_START_CODE
+      hs += 10;
+
+    // See if we have the second EXT_START_CODE. Normally 12 bytes
+    // https://git.libav.org/?p=libav.git;a=blob;f=libavcodec/mpeg12enc.c;h=3376f1075f4b7582a8e4556e98deddab3e049dab;hb=HEAD#l291
+    // ffmpeg libs might have this block missing
+    if (hs + 12 <= len && RB32(data + hs) == 0x000001b5) // EXT_START_CODE
+      hs += 12;
+
+    // See if we have the second GOP_START_CODE. Normally 31 bits == 4 bytes
+    // https://git.libav.org/?p=libav.git;a=blob;f=libavcodec/mpeg12enc.c;h=3376f1075f4b7582a8e4556e98deddab3e049dab;hb=HEAD#l304
+    if (hs + 4 <= len && RB32(data + hs) == 0x000001b8) // GOP_START_CODE
+      hs += 4;
 
-    n->pkt_meta = pktbuf_alloc(data, header_size);
+    n->pkt_meta = pktbuf_alloc(data, hs);
   }
 }
 
plus

3

--- a/AztecGame/src/MainGame/StatSelectScreen.java
+++ b/AztecGame/src/MainGame/StatSelectScreen.java
@@ -46,6 +46,8 @@
 	private boolean finished = false;
 	
 	public StatSelectScreen() {
+		unused = 10;
+		
 		titleBox = new Textbox("Select Gentleman's Stats",
 				windowWidth/2 - titleTextboxWidth/2, 10,
 				titleTextboxWidth, titleTextboxHeight, IntroSequence.input);
plus

5

--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -268,7 +268,8 @@ disk_read_blocklist_func (unsigned long long sector, unsigned long offset, unsig
 #ifdef FSYS_INITRD
 	if (fsys_table[fsys_type].mount_func == initrdfs_mount)
 	{
-		printf("(md,0x%lx,0x%x)+1",(sector << SECTOR_BITS) + offset,length);
+		if (query_block_entries >= 0)
+			printf("(md,0x%lx,0x%x)+1",(sector << SECTOR_BITS) + offset,length);
 		return;
 	}
 #endif
@@ -366,18 +367,7 @@ blocklist_func (char *arg, int flags)
 #endif /* NO_DECOMPRESSION */
 
   /* Print the device name.  */
-  if (query_block_entries >= 0)
-  {
-	grub_printf ("(%cd%d", ((current_drive & 0x80) ? 'h' : 'f'), (current_drive & ~0x80));
-  
-	if ((current_partition & 0xFF0000) != 0xFF0000)
-	    grub_printf (",%d", ((unsigned char)(current_partition >> 16)));
-  
-	if ((current_partition & 0x00FF00) != 0x00FF00)
-	    grub_printf (",%c", ('a' + ((unsigned char)(current_partition >> 8))));
-  
-	grub_printf (")");
-  }
+  if (query_block_entries >= 0) print_root_device (NULL,1);
 
   rawread_ignore_memmove_overflow = 1;
   /* Read in the whole file to DUMMY.  */
@@ -400,18 +390,8 @@ blocklist_func (char *arg, int flags)
 
   if (query_block_entries >= 0)
     grub_putchar ('\n', 255);
-#if 0
-  if (num_entries > 1)
-    query_block_entries = num_entries;
   else
     {
-      query_block_entries = 1;
-      map_start_sector = start_sector;
-      map_num_sectors = num_sectors;
-    }
-#endif
-  if (query_block_entries < 0)
-    {
       map_start_sector = blklst_start_sector;
       blklst_start_sector = 0;
       blklst_num_sectors = 0;
@@ -450,7 +430,7 @@ static struct builtin builtin_blocklist =
 {
   "blocklist",
   blocklist_func,
-  BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_SCRIPT | BUILTIN_HELP_LIST | BUILTIN_IFTITLE,
+  BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_SCRIPT | BUILTIN_HELP_LIST | BUILTIN_IFTITLE | BUILTIN_NO_DECOMPRESSION,
   "blocklist FILE",
   "Print the blocklist notation of the file FILE."
 };
@@ -11870,6 +11850,10 @@ print_root_device (char *buffer,int flag)
 				grub_printf("(md");
 				if (md_part_base) grub_printf(",0x%lx,0x%lx",md_part_base,md_part_size);
 			}
+			else if (tmp_drive == ram_drive)
+			{
+				grub_printf("(rd");
+			}
 			else if (tmp_drive & 0x80)
 			{
 				/* Hard disk drive.  */
plus

89

--- a/reviewboard/notifications/email.py
+++ b/reviewboard/notifications/email.py
@@ -318,7 +318,7 @@ def mail_review_request(review_request, changedesc=None, on_close=False):
     # If the review request is not yet public or has been discarded, don't send
     # any mail. Relax the "discarded" rule when e-mails are sent on closing
     # review requests
-    if (   not review_request.public
+    if (not review_request.public
         or (not on_close and review_request.status == 'D')):
         return
 
plus

5

--- a/ijkmedia/ijkplayer/ijkplayer.h
+++ b/ijkmedia/ijkplayer/ijkplayer.h
@@ -180,6 +180,8 @@ int             ijkmp_start(IjkMediaPlayer *mp);
 int             ijkmp_pause(IjkMediaPlayer *mp);
 int             ijkmp_stop(IjkMediaPlayer *mp);
 int             ijkmp_seek_to(IjkMediaPlayer *mp, long msec);
+// add this fuction for we want to control loop or not.
+int 			ijkmp_set_looping(IjkMediaPlayer *mp, int loop);
 int             ijkmp_get_state(IjkMediaPlayer *mp);
 bool            ijkmp_is_playing(IjkMediaPlayer *mp);
 long            ijkmp_get_current_position(IjkMediaPlayer *mp);
@@ -187,7 +189,7 @@ long            ijkmp_get_duration(IjkMediaPlayer *mp);
 long            ijkmp_get_playable_duration(IjkMediaPlayer *mp);
 
 void           *ijkmp_set_weak_thiz(IjkMediaPlayer *mp, void *weak_thiz);
-
+void 		   *ijkmp_get_weak_thiz(IjkMediaPlayer *mp);
 /* return < 0 if aborted, 0 if no packet and > 0 if packet.  */
 int             ijkmp_get_msg(IjkMediaPlayer *mp, AVMessage *msg, int block);
 
plus

3

--- a/algorithm/main.cpp
+++ b/algorithm/main.cpp
@@ -2,10 +2,12 @@
 #include "Sort.h"
 #include "MaxSubArr.h"
 #include <math.h>
+#include "Heap.h"
 
 using std::cout;
 using std::endl;
 using sort::mergesort;
+using heap::heapsort;
 
 int findLowerMidX(int *a, int n, int x) {
 	int mid_counter = 0;
@@ -57,6 +59,11 @@ int binaysearch(int *a, int s, int e, int x) {
 	return binaysearch(a, mid + 1, e, x);
 }
 
+void print(int *a, int n){
+	for(int i = 0; i < n; ++i){
+		cout << a[i] << "\t";
+	}
+}
 
 int main() {
 //    Link_Reverse_Test::test();
@@ -72,9 +79,12 @@ int main() {
 //}
 //cout << endl << "upper of x/2:" << upper << endl;
 //	cout << "find idx of " << x << ":" << binaysearch(a, 0, 3, x);
-	int a[] = {-7, 5, 4, 2,  -11, 10};
-	int max[] = {-1, -1, -1};
-	maxsub(a, 0, 5, max);
-	cout << max[0] << "\t" << max[1] << "\t" << max[2] << endl;
+//	int a[] = {-7, 5, 4, 2,  -11, 10};
+//	int max[] = {-1, -1, -1};
+//	maxsub(a, 0, 5, max);
+//	cout << max[0] << "\t" << max[1] << "\t" << max[2] << endl;
+	int a[] = {5,3,17,10,84,19,6,22,9};
+	heapsort(a, 9);
+	print(a, 9);
 	return 0;
 }
plus

3

--- a/win32/os_win32.c
+++ b/win32/os_win32.c
@@ -111,7 +111,6 @@ typedef enum
 int MPOverflow = 0;
 struct MP Ans = { 0 };
 int g_and_color;
-BYTE block[4096] = { 0 };
 int g_checked_vvs = 0;
 int g_color_dark = 0;       /* darkest color in palette */
 int g_color_bright = 0;     /* brightest color in palette */
@@ -147,7 +146,6 @@ char rlebuf[258] = { 0 };
 int g_row_count = 0;
 long savebase = 0;              /* base clock ticks */
 long saveticks = 0;             /* save after this many ticks */
-unsigned int strlocn[10*1024] = { 0 };
 char supervga_list[] =
 {
     'a', 'h', 'e', 'a', 'd', 'a',       //supervga_list   db      "aheada"
plus

3

--- a/component/backend/helpers/euvatinfo.php
+++ b/component/backend/helpers/euvatinfo.php
@@ -56,10 +56,6 @@ class AkeebasubsHelperEuVATInfo
 		// Special cases of countries which belong to a core member state for VAT calculation
 		'MC' => array('Monaco', 'FR', 20), // Monaco -> France
 		'IM' => array('Isle of Man', 'GB', 20),  // Isle of Man -> Great Britain
-		'GP' => array('Guadeloupe', 'FR', 20), // Guadeloupe -> France
-		'MQ' => array('Martinique', 'FR', 20), // Martinique -> France
-		'RE' => array('Reunion', 'FR', 20), // Reunion -> France
-		'PF' => array('French Polynesia', 'FR', 20), // French Polynesia -> France
 	);
 
 	protected static $cache = array();
plus

20

--- a/src/appleseed/renderer/kernel/rendering/masterrenderer.cpp
+++ b/src/appleseed/renderer/kernel/rendering/masterrenderer.cpp
@@ -243,31 +243,26 @@ namespace
     }
 
 #endif
-}
 
-namespace
-{
-
-struct ScopedDisplayClose
-{
-    ScopedDisplayClose(
-        Project&    project,
-        const bool  do_close)
-      : m_project(project)
-      , m_do_close(do_close)
+    struct ScopedDisplayClose
     {
-    }
-
-    ~ScopedDisplayClose()
-    {
-        if (m_do_close)
-            m_project.get_display()->close();
-    }
+        ScopedDisplayClose(
+            const Project&      project,
+            const bool          do_close)
+          : m_project(project)
+          , m_do_close(do_close)
+        {
+        }
 
-    Project&    m_project;
-    const bool  m_do_close;
-};
+        ~ScopedDisplayClose()
+        {
+            if (m_do_close)
+                m_project.get_display()->close();
+        }
 
+        const Project&  m_project;
+        const bool      m_do_close;
+    };
 }
 
 IRendererController::Status MasterRenderer::initialize_and_render_frame_sequence()
@@ -654,20 +649,18 @@ IRendererController::Status MasterRenderer::initialize_and_render_frame_sequence
     //
 
     ITileCallbackFactory* tile_callback_factory = m_tile_callback_factory;
+
     if (tile_callback_factory == 0)
     {
-        if (Display* dpy = m_project.get_display())
+        if (Display* display = m_project.get_display())
         {
-            dpy->open(m_project);
-            tile_callback_factory = dpy->get_tile_callback_factory();
+            display->open(m_project);
+            tile_callback_factory = display->get_tile_callback_factory();
         }
     }
 
-    //
-    // Close the (plugin) display, if needed,
-    // after the frame renderer has been destroyed, at scope exit.
-    //
-    ScopedDisplayClose dpy_close(
+    // If a display plugin was open, close it automatically at scope exit.
+    ScopedDisplayClose display_close(
         m_project,
         (m_tile_callback_factory == 0) && (m_project.get_display() != 0));
 
plus

788

--- a/test/runner.js
+++ b/test/runner.js
@@ -181,6 +181,20 @@ describe('Runner', function(){
     })
   })
 
+  describe('.hook(name, fn)', function(){
+    it('should execute hooks after failed test if suite bail is true', function(done){
+      runner.fail({});
+      suite.bail(true);
+      suite.afterEach(function(){
+        suite.afterAll(function() {
+          done();
+        })
+      });
+      runner.hook('afterEach', function(){});
+      runner.hook('afterAll', function(){});
+    })
+  })
+
   describe('.fail(test, err)', function(){
     it('should increment .failures', function(){
       runner.failures.should.equal(0);
plus

100

--- a/src/main/java/org/spongepowered/api/Game.java
+++ b/src/main/java/org/spongepowered/api/Game.java
@@ -165,22 +165,6 @@
     void broadcastMessage(Message<?> message);
 
     /**
-     * Creates a new clean {@link Title} configuration that will reset the
-     * currently displayed title before displaying the new one.
-     *
-     * @return A new clean {@link Title} configuration
-     */
-    Title createTitle();
-
-    /**
-     * Creates a new empty {@link Title} configuration that will just update
-     * the currently displayed title on the client.
-     *
-     * @return A new empty {@link Title} configuration
-     */
-    Title updateTitle();
-
-    /**
      * Gets the API version.
      *
      * @return The API version
plus

3

--- a/src/terminal/VehicleTerminal.java
+++ b/src/terminal/VehicleTerminal.java
@@ -7,6 +7,8 @@
 import javax.smartcardio.CardTerminals;
 import javax.smartcardio.TerminalFactory;
 
+import java.security.SecureRandom;
+
 import backend.Backend;
 import backend.InitData;
 
@@ -29,14 +31,15 @@ public static void main(String[] args){
 	
 		
 		public boolean isCardPresent() {
-			
-			SmartCard sc = bk.
-			List<SmartCard> sc;
+			//check if the card is present in the vehicle terminal
+			ReadWrite rw = new ReadWrite();
+			List<ReadWrite> rw;
 			try {
-				sc = ct.list(SmartCard.State.CARD_PRESENT);
-				for (CardTerminal c : sc) {
-					if (c.isCardPresent()){
+				rw = ct.list(ReadWrite.State.CARD_PRESENT);
+				for (VehicleTerminal v : rw) {
+					if (v.isCardPresent()){
 						return this.ready;
+						//if present it returns true and performs mutual authentication
 					}
 				}
 			} catch (CardException e) {
@@ -46,7 +49,19 @@ public boolean isCardPresent() {
 			return false;
 		}
 
+		public boolean MutualAuthenticationVT_S(){
+			boolean status = true;
+			//check mutual authentication between vehicle terminal and card
 		
+			return status;
+			
+			SecureRandom random = new SecureRandom();
+			byte bytes[] = new bytes[20];
+			random.nextBytes(bytes);
+			
+			RandomData rnd = RandomData.getInstance(RandomData.ALG_SECURE_RANDOM);
+			rnd.generateData(RP, (short)0, (short)16);
+		}
 		
 
 	
plus

89

--- a/reviewboard/notifications/email.py
+++ b/reviewboard/notifications/email.py
@@ -313,7 +313,7 @@ def mail_review_request(review_request, changedesc=None, on_close=False):
     # If the review request is not yet public or has been discarded, don't send
     # any mail. Relax the "discarded" rule when e-mails are sent on closing
     # review requests
-    if (   not review_request.public
+    if (not review_request.public
         or (not on_close and review_request.status == 'D')):
         return
 
plus

236

--- a/bin/materialize.css
+++ b/bin/materialize.css
@@ -7366,6 +7366,7 @@ form p:last-child {
   margin: 0 0 15px 0;
   padding: 0;
   display: block;
+  position: relative;
 }
 .select-wrapper span.select-dropdown:after {
   position: absolute;
plus

13

--- a/lib/progress.js
+++ b/lib/progress.js
@@ -3,10 +3,11 @@
 /**
  * Progress bar class
  **/
-function ProgressBar(maxValue) {
+function ProgressBar(maxValue, incrementValue) {
 
 	var self = this;
 	self.value = 0;
+	self.incrementValue = incrementValue || 1;
 	self.MAX_VALUE = maxValue || 100;
 	self.startTime = Date.now();
 
@@ -58,10 +59,32 @@ function ProgressBar(maxValue) {
 	 **/
 	self.setValue = function (value) {
 		self.value = value;
+		if (self.value > self.MAX_VALUE) {
+			self.value = self.MAX_VALUE;
+		}
 		self.print();
-		if (self.value >= self.MAX_VALUE && self.finishedCallback) {
+		if (self.value === self.MAX_VALUE && self.finishedCallback) {
 			process.stdout.write('\n');
 			self.finishedCallback();
+			self.finishedCallback = null;
+		}
+	};
+
+	/**
+	 * Increment the current value by the specified increment
+	 **/
+	self.tick = function () {
+		self.value += self.incrementValue;
+		if (self.value > self.MAX_VALUE) {
+			self.value = self.MAX_VALUE;
+		}
+		self.print();
+		if (self.value === self.MAX_VALUE) {
+			process.stdout.write('\n');
+			if (self.finishedCallback) {
+				self.finishedCallback();
+				self.finishedCallback = null;
+			}
 		}
 	};
 
@@ -103,7 +126,7 @@ function ProgressBar(maxValue) {
 
 // Exports
 
-exports.progressBar = function (max) {
-	var p = new ProgressBar(max);
+exports.progressBar = function (max, increment) {
+	var p = new ProgressBar(max, increment);
 	return p;
 };
plus

36

--- a/application/core/LSYii_Validators.php
+++ b/application/core/LSYii_Validators.php
@@ -11,7 +11,7 @@
  * See COPYRIGHT.php for copyright notices and details.
  *
  */
- 
+
 class LSYii_Validators extends CValidator {
 
     /**
@@ -69,7 +69,7 @@ protected function validateAttribute($object,$attribute)
     /**
     * Remove some empty characters put by CK editor
     * Did we need to do if user don't use inline HTML editor ?
-    * 
+    *
     * @param string $value
     */
     public function fixCKeditor($value)
@@ -95,8 +95,8 @@ public function fixCKeditor($value)
         return $value;
     }
     /**
-    * Remove any script or dangerous HTML 
-    * 
+    * Remove any script or dangerous HTML
+    *
     * @param string $value
     */
     public function xssFilter($value)
@@ -104,11 +104,12 @@ public function xssFilter($value)
         $filter = new CHtmlPurifier();
         $filter->options = array(
             'AutoFormat.RemoveEmpty'=>false,
+            'Core.NormalizeNewlines'=>false,
             'CSS.AllowTricky'=>true, // Allow display:none; (and other)
             'HTML.SafeObject'=>true, // To allow including youtube
             'Output.FlashCompat'=>true,
             'Attr.EnableID'=>true, // Allow to set id
-            'Attr.AllowedFrameTargets'=>array('_blank','_self'),             
+            'Attr.AllowedFrameTargets'=>array('_blank','_self'),
             'URI.AllowedSchemes'=>array(
                 'http' => true,
                 'https' => true,
@@ -154,7 +155,7 @@ public function xssFilter($value)
     }
     /**
     * Defines the customs validation rule for language string
-    * 
+    *
     * @param mixed $value
     */
     public function languageFilter($value)
@@ -164,7 +165,7 @@ public function languageFilter($value)
     }
     /**
     * Defines the customs validation rule for multi language string
-    * 
+    *
     * @param mixed $value
     */
     public function multiLanguageFilter($value)
@@ -173,5 +174,5 @@ public function multiLanguageFilter($value)
         $aValue=array_map("sanitize_languagecode",$aValue);
         return implode(" ",$aValue);
     }
-        
+
 }
plus

3

--- a/riak/patches/patch-deps_eleveldb_c__src_eleveldb.cc
+++ b/riak/patches/patch-deps_eleveldb_c__src_eleveldb.cc
@@ -8,7 +8,7 @@ At least on SunOS, 32bit size_t will be unsigned int, breaking expectations here
          if (option[0] == eleveldb::ATOM_TOTAL_LEVELDB_MEM)
          {
 -            size_t memory_sz;
-+            ulong_t memory_sz;
++            unsigned long memory_sz;
              if (enif_get_ulong(env, option[1], &memory_sz))
              {
                  if (memory_sz != 0)
@@ -17,7 +17,7 @@ At least on SunOS, 32bit size_t will be unsigned int, breaking expectations here
          else if (option[0] == eleveldb::ATOM_BLOCK_CACHE_THRESHOLD)
          {
 -            size_t memory_sz;
-+            ulong_t memory_sz;
++            unsigned long memory_sz;
              if (enif_get_ulong(env, option[1], &memory_sz))
              {
                  if (memory_sz != 0)
plus

4

--- a/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp
@@ -45,7 +45,7 @@ namespace Mantid
      * Default constructor
      */
     ParameterMap::ParameterMap()
-      : m_map()
+      : m_parameterFileNames(), m_map()
     {}
 
     /**
@@ -1026,5 +1026,21 @@ namespace Mantid
       file->closeGroup();
     }
 
+    /** Returns a list of all the parameter files loaded
+    * @returns a vector of the filenames
+    */
+    const std::vector<std::string>& ParameterMap::getParameterFilenames() const
+    {
+      return m_parameterFileNames;
+    }
+    /// 
+    /** adds a parameter filename that has been loaded
+    * @param filename the filename to add
+    */
+    void ParameterMap::addParameterFilename(const std::string& filename)
+    {
+      m_parameterFileNames.push_back(filename);
+    }
+
   } // Namespace Geometry
 } // Namespace Mantid
plus

3

--- a/DeckMaker/src/main/Main.java
+++ b/DeckMaker/src/main/Main.java
@@ -1,4 +1,6 @@
 package main;
+import java.io.File;
+
 import backend.*;
 public class Main {
 
@@ -6,7 +8,7 @@ public static void main(String[] args) {
 		// TODO Auto-generated method stub
 		@SuppressWarnings("unused")
 		GUI g = new GUI();
-		
+		//XMLcontrol.getDecks(new File("src//test"));
 		
 		
 	}