Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

indent

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-09-30 13:11:54 +02:00
parent c7e19f65ef
commit e9c10c21e1
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scm-core/src/main/java/sonia/scm/plugin/PluginCondition.java
View File

@@ -155,7 +155,7 @@ public class PluginCondition implements Cloneable, Serializable
public boolean isSupported() public boolean isSupported()
{ {
return isSupported(SCMContext.getContext().getVersion(), return isSupported(SCMContext.getContext().getVersion(),
SystemUtil.getOS(), SystemUtil.getArch()); SystemUtil.getOS(), SystemUtil.getArch());
} }
/** /**
@@ -175,7 +175,7 @@ public class PluginCondition implements Cloneable, Serializable
if (Util.isNotEmpty(minVersion) && Util.isNotEmpty(version)) if (Util.isNotEmpty(minVersion) && Util.isNotEmpty(version))
{ {
supported = (minVersion.equalsIgnoreCase(version) supported = (minVersion.equalsIgnoreCase(version)
|| new PluginVersion(version).isNewer(minVersion)); || new PluginVersion(version).isNewer(minVersion));
} }
if (supported && Util.isNotEmpty(this.os) && Util.isNotEmpty(os)) if (supported && Util.isNotEmpty(this.os) && Util.isNotEmpty(os))
@@ -253,17 +253,16 @@ public class PluginCondition implements Cloneable, Serializable
{ {
osType = osType.toLowerCase(Locale.ENGLISH); osType = osType.toLowerCase(Locale.ENGLISH);
//J-
return ((osType.indexOf("win") >= 0) && (PlatformType.WINDOWS == type)) return ((osType.indexOf("win") >= 0) && (PlatformType.WINDOWS == type))
|| ((osType.indexOf("unix") >= 0) && type.isUnix()) || ((osType.indexOf("unix") >= 0) && type.isUnix())
|| ((osType.indexOf("posix") >= 0) && type.isPosix()) || ((osType.indexOf("posix") >= 0) && type.isPosix())
|| ((osType.indexOf("mac") >= 0) && (PlatformType.MAC == type)) || ((osType.indexOf("mac") >= 0) && (PlatformType.MAC == type))
|| ((osType.indexOf("linux") >= 0) && (PlatformType.LINUX == type)) || ((osType.indexOf("linux") >= 0) && (PlatformType.LINUX == type))
|| ((osType.indexOf("solaris") >= 0) || ((osType.indexOf("solaris") >= 0) && (PlatformType.SOLARIS == type))
&& (PlatformType.SOLARIS || ((osType.indexOf("openbsd") >= 0) && (PlatformType.OPENBSD == type))
== type)) || ((osType.indexOf("openbsd") >= 0) || ((osType.indexOf("freebsd") >= 0) && (PlatformType.FREEBSD == type));
&& (PlatformType.OPENBSD //J+
== type)) || ((osType.indexOf("freebsd")
>= 0) && (PlatformType.FREEBSD == type));
} }
//~--- fields --------------------------------------------------------------- //~--- fields ---------------------------------------------------------------