Projects >> SoPra >>85133c57264b3b056802dd18687a88110ce9cd5c

Chunk
Conflicting content
		
		//////////////
		
<<<<<<< HEAD
		try {
			Anbieter a = Portal.Accountverwaltung().createAnbieter("horst","@","fu.fu");
			Kunde k = Portal.Accountverwaltung().createKunde("1", "1", "1");
			Angebot g = Portal.Angebotsverwaltung().createFlug(a,"name1", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name2", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name3", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name4", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name5", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Nachrichtenverwaltung().sendeNachricht(k, a, "2","sadfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf",g);
		} catch (Exception e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
=======
		//Portal.Angebotsverwaltung().createFlug(new Anbieter("horst","@","fu.fu"),"name", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
>>>>>>> 98091463f9937d6e390c5ec673da4e3b596c7604
		
		//showTopAngebote();
	}
Solution content
		
		//////////////
		
		try {
			Anbieter a = Portal.Accountverwaltung().createAnbieter("horst","@","fu.fu");
			Kunde k = Portal.Accountverwaltung().createKunde("1", "1", "1");
			Angebot g = Portal.Angebotsverwaltung().createFlug(a,"name1", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name2", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name3", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name4", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Angebotsverwaltung().createFlug(a,"name5", "asdfkjal�sdfmnklamsdlfkmalsdmflamnsdlfmnaklsmdfklmaklsdmflkamsdlfkmasdfasdf", 23, 23.5, new Date[] { new Date() }, "hier", "ziel", "7", "unbezahlbar");
			Portal.Nachrichtenverwaltung().sendeNachricht(k, a, "2","sadfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf",g);
		} catch (Exception e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
		
		//showTopAngebote();
	}
File
MainFrame.java
Developer's decision
Version 1
Kind of conflict
Comment
Try statement