Navigation

Changeset e3938f68c1b1b99ef7ae07c877a78bb7b4bc409c

Timestamp:

05/29/07 13:25:11 (1 year ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1180437911 +0200

git-parent:

[3924571cbcbb46f262ef7a841ae1b4111999d308]

git-author:

Christopher Jung <bktheg@web.de> 1180437911 +0200

Message:

Ein paar weitere Entitaeten hinzugefuegt und bestehende gefixt

Files:

r3924571	re3938f6
25	25	import javax.persistence.JoinColumn;
26	26	import javax.persistence.ManyToOne;
27		~~import javax.persistence.OneToOne;~~
28	27	import javax.persistence.Table;
29	28

r3924571	re3938f6
19	19	package net.driftingsouls.ds2.server.entities;
20	20
	21	import javax.persistence.Entity;
21	22	import javax.persistence.FetchType;
22	23	import javax.persistence.GeneratedValue;
…	…
25	26	import javax.persistence.ManyToOne;
26	27	import javax.persistence.Table;
27
28		~~import org.hibernate.annotations.Immutable;~~
29	28
30	29	import net.driftingsouls.ds2.server.bases.Base;
…	…
35	34	*
36	35	*/
	36	@Entity
37	37	@Table(name="fz")
38		~~@Immutable~~
39	38	public class Forschungszentrum {
40	39	@Id @GeneratedValue

r3924571	re3938f6
28	28	import javax.persistence.Table;
29	29
	30	import net.driftingsouls.ds2.server.cargo.Cargo;
30	31	import net.driftingsouls.ds2.server.framework.User;
31	32
32	33	import org.hibernate.annotations.Generated;
33	34	import org.hibernate.annotations.GenerationTime;
	35	import org.hibernate.annotations.Type;
34	36
35	37	/**
…	…
49	51	private String name;
50	52	private int type;
51		private String cargo;
	53	@Type(type="cargo")
	54	private Cargo cargo;
52	55	private int x;
53	56	private int y;
…	…
152	155	* @return Der Cargo
153	156	*/
154		public ~~String~~ getCargo() {
155		return ~~this.cargo~~;
	157	public Cargo getCargo() {
	158	return new Cargo(this.cargo);
156	159	}
157	160
…	…
160	163	* @param cargo Der neue Cargo
161	164	*/
162		public void setCargo(~~String~~ cargo) {
163		this.cargo = ~~cargo~~;
	165	public void setCargo(Cargo cargo) {
	166	this.cargo = new Cargo(cargo);
164	167	}
165	168

r3924571	re3938f6
29	29	<!-- global_sectortemplates [net.driftingsouls.ds2.server.SectorTemplateManager migrieren] -->
30	30	<mapping class="net.driftingsouls.ds2.server.entities.GtuWarenKurse" />
31		<~~!-- gtu_zwischenlager --~~>
32		<~~!-- handel --~~>
33		<~~!-- inttutorial --~~>
34		<~~!-- jumpnodes --~~>
35		<~~!-- jumps --~~>
	31	<mapping class="net.driftingsouls.ds2.server.entities.GtuZwischenlager" />
	32	<mapping class="net.driftingsouls.ds2.server.entities.Handel" />
	33	<mapping class="net.driftingsouls.ds2.server.entities.IntTutorial" />
	34	<mapping class="net.driftingsouls.ds2.server.entities.JumpNode" />
	35	<mapping class="net.driftingsouls.ds2.server.entities.Jump" />
36	36	<!-- logging -->
37	37	<!-- nebel -->
…	…
54	54	<!-- scripts -->
55	55	<!-- sectors -->
56		~~<!-- sessions -->~~
57	56	<!-- ship_fleets -->
58	57	<!-- ship_loot -->
…	…
65	64	<!-- skn_channels -->
66	65	<!-- skn_visits -->
67		~~<!-- smilies -->~~
68	66	<!-- stats_cargo -->
69	67	<!-- stats_gtu -->