BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /hostadmiral/trunk/src/ak/hostadmiral/util/ @ 1028

  → /hostadmiral/trunk/src/ak/hostadmiral/util/ @ 1029

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1028 → Rev 1029

/hostadmiral/trunk/src/ak/hostadmiral/util/DatabaseVersion.java
6,19 → 6,35
*/
public class DatabaseVersion
{
private int version;
private int major;
/**
*
* @hibernate.id generator-class="assigned"
*/
public int getVersion()
public int getMajor()
{
return version;
return major;
}
protected void setVersion(int version)
protected void setMajor(int major)
{
this.version = version;
this.major = major;
}
private int minor;
/**
*
* @hibernate.field
*/
public int getMinor()
{
return minor;
}
protected void setMinor(int minor)
{
this.minor = minor;
}
}

/hostadmiral/trunk/src/ak/hostadmiral/util/HibernateUtil.java
15,7 → 15,7
public class HibernateUtil
{
public static final int DATABASE_VERSION = 1;
public static final int DATABASE_VERSION = 2;
private static Configuration configuration;
private static SessionFactory sessionFactory;
36,7 → 36,7
if(versions.size() > 1)
throw new ModelException("Too much entries in database structure version table");
int version = ((DatabaseVersion)versions.iterator().next()).getVersion();
int version = ((DatabaseVersion)versions.iterator().next()).getMajor();
if(version != DATABASE_VERSION)
throw new ModelException("Expected database structure version "
+ DATABASE_VERSION + ", found " + version);