Updates now store UpdateComponents.

Fixes "Unknown" being displayed on restart-requiring components
Fixes issue 1279

git-svn-id: http://svn.dmdirc.com/trunk@4134 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/swing/dialogs/updater/UpdateTableModel.java

@@ -152,13 +152,7 @@ public class UpdateTableModel extends AbstractTableModel implements UpdateListen
             case 0:
                 return enabled.get(updates.get(rowIndex));
             case 1:
-                if (UpdateChecker.findComponent(updates.get(rowIndex).
-                        getComponent()) == null) {
-                    return "Unknown";
-                } else {
-                    return UpdateChecker.findComponent(updates.get(rowIndex).
-                            getComponent());
-                }
+                return updates.get(rowIndex).getComponent();
             case 2:
                 return updates.get(rowIndex).getRemoteVersion();
             case 3:

src/com/dmdirc/updater/Update.java

@@ -40,11 +40,7 @@ import java.util.List;
 public final class Update implements DownloadListener {
 
     /** Update component. */
-    private final String component;
-    /** Channel name. */
-    private final String channel;
-    /** Remote version number. */
-    private final String versionID;
+    private final UpdateComponent component;
     /** Remote version name. */
     private final String versionName;
     /** Update url. */
@@ -69,15 +65,11 @@ public final class Update implements DownloadListener {
         final String[] parts = updateInfo.split(" ");
 
         if (parts.length == 6) {
-            component = parts[1];
-            channel = parts[2];
-            versionID = parts[3];
+            component = UpdateChecker.findComponent(parts[1]);
             versionName = parts[4];
             url = parts[5];
         } else {
             component = null;
-            channel = null;
-            versionID = null;
             versionName = null;
             url = null;
 
@@ -92,7 +84,7 @@ public final class Update implements DownloadListener {
      *
      * @return The component of this update
      */
-    public String getComponent() {
+    public UpdateComponent getComponent() {
         return component;
     }
 
@@ -183,12 +175,11 @@ public final class Update implements DownloadListener {
                 setStatus(UpdateStatus.INSTALLING);
 
                 try {
-                    final boolean restart = UpdateChecker.findComponent(getComponent())
-                            .doInstall(path);
+                    final boolean restart = getComponent().doInstall(path);
 
                     if (restart) {
                         setStatus(UpdateStatus.RESTART_NEEDED);
-                        UpdateChecker.removeComponent(getComponent());
+                        UpdateChecker.removeComponent(getComponent().getName());
                     } else {
                         setStatus(UpdateStatus.INSTALLED);
                     }