Use new getMetaData method (and fix unit tests)

Change-Id: Id0ea49f368628d25bc4232eb3d3137fc41c89bbe
Depends-On: I0bf84a236b3d4a3a86bb3cdceadbfb972b7dec27
Reviewed-on: http://gerrit.dmdirc.com/2090
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/identd/IdentdServer.java

@@ -130,7 +130,7 @@ public final class IdentdServer implements Runnable {
                 Logger.userError(ErrorLevel.MEDIUM, "Unable to start identd server: " + e.getMessage());
                 if (e.getMessage().equals("Permission denied")) {
                     final PluginInfo plugin = PluginManager.getPluginManager().getPluginInfoByName("identd");
-                    if (plugin != null && PluginManager.getPluginManager().delPlugin(plugin.getRelativeFilename())) {
+                    if (plugin != null && PluginManager.getPluginManager().delPlugin(plugin.getMetaData().getRelativeFilename())) {
                         PluginManager.getPluginManager().updateAutoLoad(plugin);
                     }
                 }

src/com/dmdirc/addons/notifications/NotificationCommand.java

@@ -113,7 +113,7 @@ public class NotificationCommand extends Command implements
             final String[][] data = new String[methods.size()][1];
             int i = 0;
             for (PluginInfo method : methods) {
-                data[i][0] = method.getName();
+                data[i][0] = method.getMetaData().getName();
                 i++;
             }
 
@@ -134,7 +134,7 @@ public class NotificationCommand extends Command implements
         } else if (arg == 1 && context.getPreviousArgs().get(0)
                 .equalsIgnoreCase("--method")) {
             for (PluginInfo source : parent.getMethods()) {
-                res.add(source.getName());
+                res.add(source.getMetaData().getName());
             }
             return res;
         }

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -130,7 +130,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
      */
     private void addPlugin(final PluginInfo target) {
         if (target.hasExportedService("showNotification")) {
-            methods.add(target.getName());
+            methods.add(target.getMetaData().getName());
             addMethodToOrder(target);
         }
     }
@@ -142,8 +142,8 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
      * @param source The notification method to be tested
      */
     private void addMethodToOrder(final PluginInfo source) {
-        if (!order.contains(source.getName())) {
-            order.add(source.getName());
+        if (!order.contains(source.getMetaData().getName())) {
+            order.add(source.getMetaData().getName());
         }
     }
 
@@ -154,7 +154,7 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
      * @param target The plugin to be tested
      */
     private void removePlugin(final PluginInfo target) {
-        methods.remove(target.getName());
+        methods.remove(target.getMetaData().getName());
     }
 
     /**

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

@@ -144,7 +144,7 @@ public class AddonToggle {
      */
     public String getName() {
         if (pi != null) {
-            return pi.getNiceName();
+            return pi.getMetaData().getFriendlyName();
         }
         if (theme != null) {
             return theme.getName();
@@ -160,7 +160,7 @@ public class AddonToggle {
      */
     public String getVersion() {
         if (pi != null) {
-            return pi.getFriendlyVersion();
+            return pi.getMetaData().getFriendlyVersion();
         }
 
         if (theme != null) {
@@ -177,7 +177,7 @@ public class AddonToggle {
      */
     public String getAuthor() {
         if (pi != null) {
-            return pi.getAuthor();
+            return pi.getMetaData().getAuthor();
         }
 
         if (theme != null) {
@@ -194,7 +194,7 @@ public class AddonToggle {
      */
     public String getDescription() {
         if (pi != null) {
-            return pi.getDescription();
+            return pi.getMetaData().getDescription();
         }
 
         if (theme != null) {

src/com/dmdirc/addons/ui_swing/dialogs/about/InfoPanel.java

@@ -83,7 +83,7 @@ public final class InfoPanel extends JPanel {
                  .getGlobalConfig().getOption("identity", "modealiasversion")
                  + "<br>"
                  + "<b>Swing UI version: </b>" + controller.getPluginInfo()
-                 .getVersion().toString() + "<br>"
+                 .getMetaData().getVersion().toString() + "<br>"
                  + "<b>OS Version: </b>" + Info.getOSVersion() + "<br>"
                  + "<b>Profile directory: </b>" + Main.getConfigDir() + "<br>"
                  + "<b>Java version: </b>" + Info.getJavaVersion() + "<br>"

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceRenderer.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.plugins.PluginInfo;
-import java.awt.Color;
 
+import java.awt.Color;
 import java.awt.Component;
 
 import javax.swing.JLabel;
@@ -56,7 +56,7 @@ public class LicenceRenderer extends DefaultTreeCellRenderer {
         if (((DefaultMutableTreeNode) value).getUserObject()
                 instanceof PluginInfo) {
             setText(((PluginInfo) ((DefaultMutableTreeNode) value)
-                    .getUserObject()).getNiceName());
+                    .getUserObject()).getMetaData().getFriendlyName());
         }
         return label;
     }

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -43,8 +43,8 @@ import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeSelectionModel;
-import net.miginfocom.layout.PlatformDefaults;
 
+import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -148,10 +148,10 @@ public final class LicencesPanel extends JPanel implements TreeSelectionListener
         licence.setText(((Licence) userObject).getBody());
         } else if (userObject instanceof PluginInfo) {
             final PluginInfo pi = (PluginInfo) userObject;
-            licence.setText("<b>Name:</b> " + pi.getNiceName() + "<br>"
-                    + "<b>Version:</b> " + pi.getFriendlyVersion() + "<br>"
-                    + "<b>Author:</b> " + pi.getAuthor() + "<br>"
-                    + "<b>Description:</b> " + pi.getDescription() + "<br>");
+            licence.setText("<b>Name:</b> " + pi.getMetaData().getFriendlyName() + "<br>"
+                    + "<b>Version:</b> " + pi.getMetaData().getFriendlyVersion() + "<br>"
+                    + "<b>Author:</b> " + pi.getMetaData().getAuthor() + "<br>"
+                    + "<b>Description:</b> " + pi.getMetaData().getDescription() + "<br>");
         } else {
             licence.setText("<b>Name:</b> DMDirc<br>"
                     + "<b>Version:</b> " + IdentityManager.getGlobalConfig().

test/com/dmdirc/addons/ui_swing/MainFrameTest.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2011 DMDirc Developers
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,11 +24,12 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.harness.ui.DMDircUITestCase;
 import org.junit.Test;
+import org.uispec4j.Trigger;
 import org.uispec4j.Window;
 import org.uispec4j.interception.WindowInterceptor;
 
 public class MainFrameTest extends DMDircUITestCase {
-    
+
     private static Window window;
 
     static {
@@ -36,8 +37,15 @@ public class MainFrameTest extends DMDircUITestCase {
 
         window = new Window(new MainFrame(controller));
         window.containsMenuBar().check();
+        WindowInterceptor.run(new Trigger() {
+
+            @Override
+            public void run() throws Exception {
+                window.getAwtComponent().setVisible(true);
+            }
+        });
     }
-    
+
     @Test
     public void testNewServerDialog() {
         Window popup = WindowInterceptor.run(window.getMenuBar()
@@ -68,6 +76,7 @@ public class MainFrameTest extends DMDircUITestCase {
 
     @Test
     public void testProfileManagerDialog() {
+        Window main = WindowInterceptor.run(Trigger.DO_NOTHING);
         Window popup = WindowInterceptor.run(window.getMenuBar()
                 .getMenu("Settings").getSubMenu("Profile Manager").triggerClick());
         popup.titleEquals("DMDirc: Profile Editor").check();

test/com/dmdirc/harness/ui/DMDircUITestCase.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2011 DMDirc Developers
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,17 +22,19 @@
 
 package com.dmdirc.harness.ui;
 
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.Main;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
-import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrame;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.IRCDocument;
+import com.dmdirc.updater.Version;
 
 import org.uispec4j.UISpecTestCase;
 import static org.mockito.Mockito.*;
@@ -63,10 +65,15 @@ public class DMDircUITestCase extends UISpecTestCase {
      * @return SwingController mock
      */
     public static SwingController getMockedController() {
+        final PluginInfo pluginInfo = mock(PluginInfo.class);
+        final PluginMetaData metaData = mock(PluginMetaData.class);
         SwingController controller = mock(SwingController.class);
         final SwingWindowFactory windowFactory = mock(SwingWindowFactory.class);
         when(controller.getDomain()).thenReturn("test");
         when(controller.getWindowFactory()).thenReturn(windowFactory);
+        when(controller.getPluginInfo()).thenReturn(pluginInfo);
+        when(pluginInfo.getMetaData()).thenReturn(metaData);
+        when(metaData.getVersion()).thenReturn(new Version(1));
 
         return controller;
     }