Browse Source

Merge pull request #919 in BA/design from ~JU/ba-dev-design:dev to dev

* commit 'f18b20cd96bf6cb86ca5e0fc7968eda974949d12':
  比较版本号
  版本比较: 10.0 > 9.0 1.10 > 1.9 1.1.2 > 1.1.1 1.1.1 > 1.1
master
superman 8 years ago
parent
commit
b9eeb8996f
  1. 12
      designer_base/src/com/fr/design/extra/PluginHelper.java

12
designer_base/src/com/fr/design/extra/PluginHelper.java

@ -8,7 +8,6 @@ import com.fr.general.*;
import com.fr.general.http.HttpClient; import com.fr.general.http.HttpClient;
import com.fr.plugin.Plugin; import com.fr.plugin.Plugin;
import com.fr.plugin.PluginConfigManager; import com.fr.plugin.PluginConfigManager;
import com.fr.stable.plugin.PluginConstants;
import com.fr.plugin.PluginLoader; import com.fr.plugin.PluginLoader;
import com.fr.plugin.PluginManagerHelper; import com.fr.plugin.PluginManagerHelper;
import com.fr.plugin.dependence.PluginDependence; import com.fr.plugin.dependence.PluginDependence;
@ -18,11 +17,15 @@ import com.fr.stable.ArrayUtils;
import com.fr.stable.EncodeConstants; import com.fr.stable.EncodeConstants;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.plugin.PluginConstants;
import com.fr.stable.project.ProjectConstants; import com.fr.stable.project.ProjectConstants;
import com.fr.stable.xml.XMLTools; import com.fr.stable.xml.XMLTools;
import javax.swing.*; import javax.swing.*;
import java.io.*; import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
@ -43,6 +46,7 @@ public class PluginHelper {
public static final String TEMP_FILE = "temp.zip"; public static final String TEMP_FILE = "temp.zip";
public static final String CONNECTION_404 = "404"; public static final String CONNECTION_404 = "404";
/** /**
* 下载插件 * 下载插件
* *
@ -337,9 +341,11 @@ public class PluginHelper {
* @return 当前插件比老的插件版本高则返回true否则返回false * @return 当前插件比老的插件版本高则返回true否则返回false
*/ */
public static boolean isNewThan(Plugin plugin, Plugin oldPlugin) { public static boolean isNewThan(Plugin plugin, Plugin oldPlugin) {
return ComparatorUtils.compare(plugin.getVersion(), oldPlugin.getVersion()) >= 0;
return plugin.versionCompareTo(oldPlugin) >= 0;
} }
private static String sendInstalledPluginInfo(final Plugin plugin) { private static String sendInstalledPluginInfo(final Plugin plugin) {
if (StableUtils.isDebug()) { if (StableUtils.isDebug()) {
return "debug status"; return "debug status";

Loading…
Cancel
Save