Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

hide constructor and throw exception if the version could not be parsed

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-02-19 21:47:45 +01:00
parent b6c65e085b
commit 269178f0a2
11 changed files with 162 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-plugin-backend/src/main/java/sonia/scm/plugin/PluginInformationVersionComparator.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.version.Version;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
@@ -73,8 +74,8 @@ public class PluginInformationVersionComparator
if (Util.isNotEmpty(v1) && Util.isNotEmpty(v2))
{
if (PluginVersion.createVersion(v1).isNewer(
PluginVersion.createVersion(v2)))
if (Version.parse(v1).isNewer(
Version.parse(v2)))
{
result = -1;
}

10
scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/PluginInformationComparator.java
View File

@@ -36,7 +36,7 @@ package sonia.scm.plugin.rest;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginVersion;
import sonia.scm.version.Version;
//~--- JDK imports ------------------------------------------------------------
@@ -76,10 +76,10 @@ public class PluginInformationComparator
if (c == 0)
{
PluginVersion version =
PluginVersion.createVersion(plugin.getVersion());
PluginVersion otherVersion =
PluginVersion.createVersion(otherPlugin.getVersion());
Version version =
Version.parse(plugin.getVersion());
Version otherVersion =
Version.parse(otherPlugin.getVersion());
c = version.compareTo(otherVersion);
}

4
scm-plugin-backend/src/main/java/sonia/scm/plugin/rest/api/PluginResource.java
View File

@@ -50,7 +50,7 @@ import sonia.scm.plugin.PluginBackend;
import sonia.scm.plugin.PluginBackendListener;
import sonia.scm.plugin.PluginCenter;
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginVersion;
import sonia.scm.version.Version;
import sonia.scm.plugin.rest.PluginInformationComparator;
//~--- JDK imports ------------------------------------------------------------
@@ -264,7 +264,7 @@ public class PluginResource implements PluginBackendListener
*/
private boolean isNewer(PluginInformation plugin, PluginInformation newest)
{
return new PluginVersion(plugin.getVersion()).isNewer(newest.getVersion());
return Version.parse(plugin.getVersion()).isNewer(newest.getVersion());
}
/**