Fixes issue 3285: s/License/Licences

Change-Id: I288d2816fd176fdc439b2f699d2fe19e53fb0c15
Reviewed-on: http://gerrit.dmdirc.com/573
Automatic-Compile: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -112,7 +112,7 @@ public final class AboutDialog extends StandardDialog implements
 
         tabbedPane.add("About", new AboutPanel());
         tabbedPane.add("Credits", cp);
-        tabbedPane.add("License", new LicensePanel());
+        tabbedPane.add("Licences", new LicencesPanel());
         tabbedPane.add("Information", new InfoPanel());
         tabbedPane.addChangeListener(this);
 

src/com/dmdirc/addons/ui_swing/dialogs/about/License.java → src/com/dmdirc/addons/ui_swing/dialogs/about/Licence.java

@@ -24,22 +24,22 @@
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
 /**
- * Simple class to describe a license.
+ * Simple class to describe a licence.
  */
-public class License {
+public class Licence {
 
     private String name;
     private String component;
     private String body;
 
     /**
-     * Instantiates a new license with the specified attributes.
+     * Instantiates a new licence with the specified attributes.
      *
-     * @param name Name of the license
-     * @param component Component the license applies to
-     * @param body Body of the license
+     * @param name Name of the licence
+     * @param component Component the licence applies to
+     * @param body Body of the licence
      */
-    public License(final String name, final String component, final String body) {
+    public Licence(final String name, final String component, final String body) {
         this.name = name;
         this.component = component;
         this.body = body;

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenseLoader.java → src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -40,19 +40,19 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 
 /**
- * Background loader of licenses into a list.
+ * Background loader of licences into a list.
  */
-public class LicenseLoader extends LoggingSwingWorker<Void, Void> {
+public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
 
-    /** Model to load licenses into. */
-    private GenericListModel<License> model;
+    /** Model to load licences into. */
+    private GenericListModel<Licence> model;
 
     /**
-     * Instantiates a new license loader.
+     * Instantiates a new licence loader.
      *
-     * @param model Model to load licenses into
+     * @param model Model to load licences into
      */
-    public LicenseLoader(final GenericListModel<License> model) {
+    public LicenceLoader(final GenericListModel<Licence> model) {
         this.model = model;
     }
 
@@ -65,29 +65,29 @@ public class LicenseLoader extends LoggingSwingWorker<Void, Void> {
     protected Void doInBackground() throws Exception {
         final ResourceManager rm = ResourceManager.getResourceManager();
         if (rm == null) {
-            Logger.userError(ErrorLevel.LOW, "Unable to load licenses, " +
+            Logger.userError(ErrorLevel.LOW, "Unable to load licences, " +
                     "no resource manager");
         } else {
-            final Map<String, InputStream> licenses =
+            final Map<String, InputStream> licences =
                     new TreeMap<String, InputStream>(String.CASE_INSENSITIVE_ORDER);
-            licenses.putAll(rm.getResourcesStartingWithAsInputStreams(
-                    "com/dmdirc/licenses/"));
+            licences.putAll(rm.getResourcesStartingWithAsInputStreams(
+                    "com/dmdirc/licences/"));
             for (PluginInfo pi : PluginManager.getPluginManager().getPluginInfos()) {
-                licenses.putAll(pi.getLicenseStreams());
+                licences.putAll(pi.getLicenceStreams());
             }
-            for (Entry<String, InputStream> entry : licenses.entrySet()) {
-                final String licenseString = entry.getKey().substring(entry.
+            for (Entry<String, InputStream> entry : licences.entrySet()) {
+                final String licenceString = entry.getKey().substring(entry.
                         getKey().
                         lastIndexOf('/') + 1);
-                if (licenseString.length() > 1) {
-                    final String licenseStringParts[] = licenseString.split(
+                if (licenceString.length() > 1) {
+                    final String licenceStringParts[] = licenceString.split(
                             " - ");
-                    final License license = new License(licenseStringParts[1],
-                            licenseStringParts[0], "<html><h1>" +
-                            licenseStringParts[1] + "</h1><p>" + readInputStream(
+                    final Licence licence = new Licence(licenceStringParts[1],
+                            licenceStringParts[0], "<html><h1>" +
+                            licenceStringParts[1] + "</h1><p>" + readInputStream(
                             entry.getValue()).replaceAll("\n", "<br>") +
                             "</p></html>");
-                    model.add(license);
+                    model.add(licence);
                 }
             }
         }

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

@@ -33,7 +33,6 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -43,9 +42,9 @@ import javax.swing.text.html.HTMLEditorKit;
 import net.miginfocom.swing.MigLayout;
 
 /**
- * License panel.
+ * Licences panel.
  */
-public final class LicensePanel extends JPanel implements ListSelectionListener {
+public final class LicencesPanel extends JPanel implements ListSelectionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -53,19 +52,19 @@ public final class LicensePanel extends JPanel implements ListSelectionListener
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 3;
-    /** License scroll pane. */
+    /** Licence scroll pane. */
     private JScrollPane scrollPane;
-    /** License list model */
-    private GenericListModel<License> listModel;
-    /** License textpane. */
-    private JEditorPane license;
-    /** License list. */
+    /** Licence list model */
+    private GenericListModel<Licence> listModel;
+    /** Licence textpane. */
+    private JEditorPane licence;
+    /** Licence list. */
     private JList list;
     /** Selected index. */
     private int selectedIndex;
 
-    /** Creates a new instance of LicensePanel. */
-    public LicensePanel() {
+    /** Creates a new instance of LicencesPanel. */
+    public LicencesPanel() {
         super();
 
         initComponents();
@@ -94,19 +93,19 @@ public final class LicensePanel extends JPanel implements ListSelectionListener
     /** Initialises the components. */
     private void initComponents() {
         setOpaque(UIUtilities.getTabbedPaneOpaque());
-        listModel = new GenericListModel<License>();
+        listModel = new GenericListModel<Licence>();
         list = new JList(listModel);
         list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         new ListScroller(list);
-        new LicenseLoader(listModel).execute();
-        license = new JEditorPane();
-        license.setEditorKit(new HTMLEditorKit());
+        new LicenceLoader(listModel).execute();
+        licence = new JEditorPane();
+        licence.setEditorKit(new HTMLEditorKit());
         final Font font = UIManager.getFont("Label.font");
-        ((HTMLDocument) license.getDocument()).getStyleSheet().addRule("body " +
+        ((HTMLDocument) licence.getDocument()).getStyleSheet().addRule("body " +
                 "{ font-family: " + font.getFamily() + "; " + "font-size: " +
                 font.getSize() + "pt; }");
-        license.setEditable(false);
-        scrollPane = new JScrollPane(license);
+        licence.setEditable(false);
+        scrollPane = new JScrollPane(licence);
     }
 
     /** {@inheritDoc} */
@@ -116,7 +115,7 @@ public final class LicensePanel extends JPanel implements ListSelectionListener
             if (list.getSelectedIndex() == -1) {
                 list.setSelectedIndex(selectedIndex);
             } else {
-                license.setText(listModel.get(list.getSelectedIndex()).getBody());
+                licence.setText(listModel.get(list.getSelectedIndex()).getBody());
                 UIUtilities.resetScrollPane(scrollPane);
             }
             selectedIndex = list.getSelectedIndex();