merge with branch issue-182

This commit is contained in:
Sebastian Sdorra
2012-06-15 16:36:02 +02:00
3 changed files with 56 additions and 5 deletions

View File

@@ -39,8 +39,11 @@ package sonia.scm.repository;
*/
public enum Compatibility
{
NONE(false, false, false), PRE14(true, true, true), PRE15(false, true, true),
PRE16(false, false, true);
NONE(false, false, false, false, false),
PRE14(true, true, true, true, false), PRE15(false, true, true, true, false),
PRE16(false, false, true, true, false),
PRE17(false, false, false, true, false),
WITH17(false, false, false, false, true);
/**
* Field description
@@ -48,13 +51,18 @@ public enum Compatibility
* @param pre14Compatible
* @param pre15Compatible
* @param pre16Compatible
* @param pre17Compatible
* @param with17Compatible
*/
private Compatibility(boolean pre14Compatible, boolean pre15Compatible,
boolean pre16Compatible)
boolean pre16Compatible, boolean pre17Compatible,
boolean with17Compatible)
{
this.pre14Compatible = pre14Compatible;
this.pre15Compatible = pre15Compatible;
this.pre16Compatible = pre16Compatible;
this.pre17Compatible = pre17Compatible;
this.with17Compatible = with17Compatible;
}
//~--- get methods ----------------------------------------------------------
@@ -92,6 +100,28 @@ public enum Compatibility
return pre16Compatible;
}
/**
* Method description
*
*
* @return
*/
public boolean isPre17Compatible()
{
return pre17Compatible;
}
/**
* Method description
*
*
* @return
*/
public boolean isWith17Compatible()
{
return with17Compatible;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
@@ -102,4 +132,10 @@ public enum Compatibility
/** Field description */
private boolean pre16Compatible;
/** Field description */
private boolean pre17Compatible;
/** Field description */
private boolean with17Compatible;
}

View File

@@ -293,7 +293,9 @@ public class SvnRepositoryHandler
log.append(directory.getName()).append("\": pre14Compatible=");
log.append(comp.isPre14Compatible()).append(", pre15Compatible=");
log.append(comp.isPre15Compatible()).append(", pre16Compatible=");
log.append(comp.isPre16Compatible());
log.append(comp.isPre16Compatible()).append(", pre17Compatible=");
log.append(comp.isPre17Compatible()).append(", with17Compatible=");
log.append(comp.isWith17Compatible());
logger.debug(log.toString());
}
@@ -303,7 +305,8 @@ public class SvnRepositoryHandler
{
SVNURL url = SVNRepositoryFactory.createLocalRepository(directory, null,
true, false, comp.isPre14Compatible(),
comp.isPre15Compatible(), comp.isPre16Compatible());
comp.isPre15Compatible(), comp.isPre16Compatible(),
comp.isPre17Compatible(), comp.isWith17Compatible());
svnRepository = SVNRepositoryFactory.create(url);

View File

@@ -40,6 +40,8 @@ Sonia.svn.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, {
pre14CompatibleText: 'Pre 1.4 Compatible',
pre15CompatibleText: 'Pre 1.5 Compatible',
pre16CompatibleText: 'Pre 1.6 Compatible',
pre17CompatibleText: 'Pre 1.7 Compatible',
with17CompatibleText: 'With 1.7 Compatible',
enableGZipText: 'Enable GZip Encoding',
disabledText: 'Disabled',
@@ -80,6 +82,14 @@ Sonia.svn.ConfigPanel = Ext.extend(Sonia.config.SimpleConfigForm, {
boxLabel: this.pre16CompatibleText,
inputValue: 'PRE16',
name: 'compatibility'
},{
boxLabel: this.pre17CompatibleText,
inputValue: 'PRE17',
name: 'compatibility'
},{
boxLabel: this.with17CompatibleText,
inputValue: 'WITH17',
name: 'compatibility'
}]
},{
xtype: 'checkbox',
@@ -117,6 +127,8 @@ if ( i18n != null && i18n.country == 'de' ){
pre14CompatibleText: 'Mit Versionen vor 1.4 kompatibel',
pre15CompatibleText: 'Mit Versionen vor 1.5 kompatibel',
pre16CompatibleText: 'Mit Versionen vor 1.6 kompatibel',
pre17CompatibleText: 'Mit Versionen vor 1.7 kompatibel',
with17CompatibleText: 'Mit Version 1.7 kompatibel',
disabledText: 'Deaktivieren',
// helpTexts