Version -> 0.5.1RC1

Removed non core plugins


git-svn-id: http://svn.dmdirc.com/tags/0.5.1@2294 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Main.java

@@ -48,12 +48,12 @@ public final class Main {
     /**
      * Stores the current textual program version.
      */
-    public static final String VERSION = "SVN";
+    public static final String VERSION = "0.5.1RC1";
     
     /**
      * Stores the release date of this version.
      */
-    public static final int RELEASE_DATE = 0;
+    public static final int RELEASE_DATE = 20070928;
     
     /**
      * Stores the update channel that this version came from, if any.

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.audio;
-
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.plugins.Plugin;
-import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.interfaces.InputWindow;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * The Audio Command allows playing of audio files.
- *
- * @author Shane "Dataforce" Mc Cormack
- * @version $Id: AudioCommand.java 969 2007-04-30 18:38:20Z ShaneMcC $
- */
-public final class AudioCommand extends GlobalCommand {
-
-	/**
-	 * Creates a new instance of LoggingCommand.
-	 */
-	public AudioCommand() {
-		super();
-		CommandManager.registerCommand(this);
-	}
-		
-	/**
-	 * Executes this command.
-	 *
-	 * @param origin The frame in which this command was issued
-	 * @param server The server object that this command is associated with
-	 * @param isSilent Whether this command is silenced or not
-	 * @param args The user supplied arguments
-	 */
-	public void execute(final InputWindow origin, final boolean isSilent, final String... args) {
-		final String filename = implodeArgs(args);
-		final File file = new File(filename);
-		if (file.exists()) {
-			if (AudioPlayer.isValid(file)) {
-				new AudioPlayer(file).start();
-			} else {
-				sendLine(origin, isSilent, "commandError", "Invalid file type");
-			}
-		} else {
-			sendLine(origin, isSilent, "commandError", "File does not exist");
-		}
-	}
-
-	/**
-	 * Returns this command's name.
-	 *
-	 * @return The name of this command
-	 */
-	public String getName() { return "audio"; }
-	
-	/**
-	 * Returns whether or not this command should be shown in help messages.
-	 *
-	 * @return True iff the command should be shown, false otherwise
-	 */
-	public boolean showInHelp() { return true; }
-	
-	/**
-	 * Indicates whether this command is polyadic or not.
-	 *
-	 * @return True iff this command is polyadic, false otherwise
-	 */
-	public boolean isPolyadic() { return true; }
-	
-	/**
-	 * Returns the arity of this command.
-	 *
-	 * @return This command's arity
-	 */
-	public int getArity() { return 0; }
-	
-	/**
-	 * Returns a string representing the help message for this command.
-	 *
-	 * @return the help message for this command
-	 */
-	public String getHelp() { return this.getName() + " <file>"; }
-	
-	/**
-	 * Get SVN Version information.
-	 *
-	 * @return SVN Version String
-	 */
-	public static String getSvnInfo() { return "$Id: AudioCommand.java 969 2007-04-30 18:38:20Z ShaneMcC $"; }	
-}
-

src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.audio;
-
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.SourceDataLine;
-import javax.sound.sampled.DataLine;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * The AudioPlayer handles the playing of the audio
- *
- * @author Shane "Dataforce" Mc Cormack
- * @version $Id: AudioPlayer.java 969 2007-04-30 18:38:20Z ShaneMcC $
- */
-public final class AudioPlayer extends Thread {
-	/** The AudioType enum */
-	private enum AudioType { WAV, OTHER; }
-	
-	/** The file object of the file to play */
-	final File myFile;
-	
-	/**
-	 * Create the AudioPlayer
-	 *
-	 * @param file The file to play
-	 */
-	public AudioPlayer(final File file) {
-		myFile = file;
-	}
-	
-	/**
-	 * Run this AudioPlayer
-	 */
-	public void run() {
-		final AudioType type = getAudioType(myFile);
-		switch (type) {
-			case WAV:
-				playWav();
-				break;
-			default:
-				break;
-		}
-	}
-	
-	/**
-	 * Check if this File is a supported file type
-	 *
-	 * @param file the File to check
-	 * @return true if playable, else false.
-	 */
-	public static boolean isValid(final File file) {
-		final AudioType type = getAudioType(file);
-		return (type != AudioType.OTHER);
-	}
-	
-	/**
-	 * Get the AudioType of a given file
-	 *
-	 * @param file the File to check
-	 * @return AudioType for this file.
-	 */
-	public static AudioType getAudioType(final File file) {
-		AudioType type;
-		try {
-			AudioSystem.getAudioInputStream(file);
-			type = AudioType.WAV;
-		} catch (Exception e) {
-			type = AudioType.OTHER;
-		}
-		return type;
-	}
-	
-	/**
-	 * Play the file as a wav file.
-	 * Based on http://www.anyexample.com/programming/java/java_play_wav_sound_file.xml
-	 *
-	 */
-	private void playWav() {
-		final int EXTERNAL_BUFFER_SIZE = 524288; // 128Kb
-		AudioInputStream audioInputStream = null;
-		try {
-			audioInputStream = AudioSystem.getAudioInputStream(myFile);
-		} catch (Exception e) { return; }
-		
-		AudioFormat format = audioInputStream.getFormat();
-		SourceDataLine auline = null;
-		DataLine.Info info = new DataLine.Info(SourceDataLine.class, format);
-		
-		try {
-			auline = (SourceDataLine) AudioSystem.getLine(info);
-			auline.open(format);
-		} catch (Exception e) { return; }
-		
-		auline.start();
-		int nBytesRead = 0;
-		byte[] abData = new byte[EXTERNAL_BUFFER_SIZE];
- 
-		try {
-			while (nBytesRead != -1) {
-				nBytesRead = audioInputStream.read(abData, 0, abData.length);
-				if (nBytesRead >= 0) {
-					auline.write(abData, 0, nBytesRead);
-				}
-			}
-		} catch (Exception e) {
-			/** Do Nothing */
-		} finally {
-			auline.drain();
-			auline.close();
-		}
-		try {
-			audioInputStream.close();
-		} catch (Exception e) { }
-	}
-}
-

src/com/dmdirc/addons/audio/AudioPlugin.java

@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.audio;
-
-import com.dmdirc.plugins.Plugin;
-import com.dmdirc.commandparser.CommandManager;
-/**
- * Adds Audio playing facility to client.
- *
- * @author Shane 'Dataforce' McCormack
- * @version $Id: AudioPlugin.java 969 2007-04-30 18:38:20Z ShaneMcC $
- */
-public final class AudioPlugin extends Plugin {
-	/** The AudioCommand we created */
-	private AudioCommand command = null;
-
-	/**
-	 * Creates a new instance of the Audio Plugin.
-	 */
-	public AudioPlugin() { super(); }
-	
-	/**
-	 * Called when the plugin is loaded.
-	 *
-	 * @return false if the plugin can not be loaded
-	 */
-	public boolean onLoad() {
-		return true;
-	}
-	
-	/**
-	 * Called when this plugin is activated.
-	 */
-	public void onActivate() {
-		command = new AudioCommand();
-	}
-	
-	/**
-	 * Called when this plugin is deactivated.
-	 */
-	public void onDeactivate() {
-		CommandManager.unregisterCommand(command);
-	}
-
-	/**
-	 * Get the plugin version.
-	 *
-	 * @return Plugin Version
-	 */
-	public String getVersion() { return "0.1"; }
-	
-	/**
-	 * Get the plugin Author.
-	 *
-	 * @return Author of plugin
-	 */
-	public String getAuthor() { return "Shane <shane@dmdirc.com>"; }
-	
-	/**
-	 * Get the plugin Description.
-	 *
-	 * @return Description of plugin
-	 */
-	public String getDescription() { return "Allows playing audio files"; }
-	
-	/**
-	 * Get the name of the plugin (used in "Manage Plugins" dialog).
-	 *
-	 * @return Name of plugin
-	 */
-	public String toString() { return "Audio Plugin"; }
-	
-	/**
-	 * Get SVN Version information.
-	 *
-	 * @return SVN Version String
-	 */
-	public static String getSvnInfo() { return "$Id: IRCParser.java 969 2007-04-30 18:38:20Z ShaneMcC $"; }	
-}
-

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.dcop;
-
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-import java.util.List;
-
-/**
- * The dcop command retrieves information from a dcop application.
- * @author chris
- */
-public final class DcopCommand extends ServerCommand {
-    
-    /**
-     * Creates a new instance of DcopCommand.
-     */
-    public DcopCommand() {
-        super();
-        
-        CommandManager.registerCommand(this);
-    }
-    
-    /**
-     * Executes this command.
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
-    public void execute(final InputWindow origin, final Server server,
-            final boolean isSilent, final String... args) {
-        final List<String> res = DcopPlugin.getDcopResult("dcop " + implodeArgs(args));
-        for (String line : res) {
-            sendLine(origin, isSilent, "commandOutput", line);
-        }
-    }
-    
-    
-    /** {@inheritDoc}. */
-    public String getName() {
-        return "dcop";
-    }
-    
-    /** {@inheritDoc}. */
-    public boolean showInHelp() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 3;
-    }
-    
-    /** {@inheritDoc}. */
-    public String getHelp() {
-        return "dcop <app> <object> <function> - retrieves information from a DCOP aplication";
-    }
-    
-}

src/com/dmdirc/addons/dcop/DcopPlugin.java

@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.dcop;
-
-import com.dmdirc.plugins.Plugin;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Allows the user to execute dcop commands (and read the results).
- * 
- * @author chris
- */
-public final class DcopPlugin extends Plugin {
-    
-    /** Creates a new instance of DcopPlugin. */
-    public DcopPlugin() {
-        super();
-    }
-    
-    /**
-     * Retrieves the result from executing the specified command.
-     *
-     * @param command The command to be executed
-     * @return The output of the specified command
-     */
-    public static List<String> getDcopResult(final String command) {
-        final ArrayList<String> result = new ArrayList<String>();
-
-        InputStreamReader reader;
-        BufferedReader input;
-        Process process;
-        
-        try {
-            process = Runtime.getRuntime().exec(command);
-            
-            reader = new InputStreamReader(process.getInputStream());
-            input = new BufferedReader(reader);
-            
-            String line = "";
-            
-            while ((line = input.readLine()) != null) {
-                result.add(line);
-            }
-            
-            reader.close();
-            input.close();
-            process.destroy();
-        } catch (IOException ex) {
-            // Do nothing
-        }
-        
-        return result;
-    }
-    
-    /** {@inheritDoc}. */
-    public boolean onLoad() {
-        new DcopCommand();
-        
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public String getVersion() {
-        return "0.2";
-    }
-    
-    /** {@inheritDoc}. */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc}. */
-    public String getDescription() {
-        return "Provides commands to interface with DCOP applications";
-    }
-    
-    /** {@inheritDoc}. */
-    public boolean isConfigurable() {
-        return false;
-    }
-    
-    /** {@inheritDoc}. */
-    public String toString() {
-        return "DCOP Plugin";
-    }
-}

src/com/dmdirc/addons/dcop/package-info.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * DCOP interface for DMDirc.
- */
-package com.dmdirc.addons.dcop;

src/com/dmdirc/addons/mediasources/dcop/AmarokSource.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.mediasources.dcop;
-
-import com.dmdirc.addons.dcop.DcopPlugin;
-import com.dmdirc.addons.nowplaying.MediaSource;
-
-/**
- * Uses DCOP to retrieve now playing info from Amarok.
- *
- * @author chris
- */
-public class AmarokSource implements MediaSource {
-    
-    /** Instantiates the media source. */
-    public AmarokSource() {
-        //Do nothing
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isRunning() {
-        return DcopPlugin.getDcopResult("dcop amarok player isPlaying").size() > 0;
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isPlaying() {
-        final String result = DcopPlugin.getDcopResult("dcop amarok player isPlaying").get(0);
-        
-        return Boolean.parseBoolean(result);
-    }
-    
-    /** {@inheritDoc} */
-    public String getInformation() {
-        return DcopPlugin.getDcopResult("dcop amarok player nowPlaying").get(0);
-    }
-    
-    /** {@inheritDoc} */
-    public String getName() {
-        return "Amarok";
-    }
-    
-}

src/com/dmdirc/addons/mediasources/dcop/DcopMediaSourcePlugin.java

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.mediasources.dcop;
-
-import com.dmdirc.addons.nowplaying.MediaSource;
-import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.plugins.Plugin;
-import com.dmdirc.plugins.PluginManager;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Manages all DCOP based media sources.
- */
-public class DcopMediaSourcePlugin extends Plugin
-        implements MediaSourceManager {
-    
-    /** Media sources. */
-    private final List<MediaSource> sources;
-    
-    /**
-     * Creates a new instance of DcopMediaSourcePlugin.
-     */
-    public DcopMediaSourcePlugin() {
-        super();
-        sources = new ArrayList<MediaSource>();
-        sources.add(new AmarokSource());
-        sources.add(new KaffeineSource());
-        sources.add(new NoatunSource());
-    }
-    
-    /** {@inheritDoc} */
-    public List<MediaSource> getSources() {
-        return sources;
-    }
-    
-    /** {@inheritDoc} */
-    public boolean onLoad() {
-        if (Arrays.asList(PluginManager.getPluginManager().getNames()).
-                contains("com.dmdirc.addons.dcop.dcopplugin")) {
-            return true;
-        }
-        return false;
-    }
-    
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.1";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Greboid <greboid@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Provides DCOP media sources for the now playing plugin";
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return "DCOP media sources";
-    }
-}

src/com/dmdirc/addons/mediasources/dcop/KaffeineSource.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.mediasources.dcop;
-
-import com.dmdirc.addons.dcop.DcopPlugin;
-import com.dmdirc.addons.nowplaying.MediaSource;
-
-/**
- * Uses DCOP to retrieve now playing info from Kaffeine.
- *
- * @author chris
- */
-public class KaffeineSource implements MediaSource {
-    
-    /** Instantiates the media source. */
-    public KaffeineSource() {
-        //Do nothing
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isRunning() {        
-        return DcopPlugin.getDcopResult("dcop kaffeine KaffeineIface isPlaying").size() > 0;
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isPlaying() {
-        final String result = DcopPlugin.getDcopResult("dcop kaffeine KaffeineIface isPlaying").get(0);
-        
-        return Boolean.parseBoolean(result);
-    }
-    
-    /** {@inheritDoc} */
-    public String getInformation() {
-        return DcopPlugin.getDcopResult("dcop kaffeine KaffeineIface artist").get(0) + " - "
-                + DcopPlugin.getDcopResult("dcop kaffeine KaffeineIface title").get(0);
-    }
-    
-    /** {@inheritDoc} */
-    public String getName() {
-        return "Kaffeine";
-    }
-    
-}

src/com/dmdirc/addons/mediasources/dcop/NoatunSource.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.mediasources.dcop;
-
-import com.dmdirc.addons.dcop.DcopPlugin;
-import com.dmdirc.addons.nowplaying.MediaSource;
-
-/**
- * Uses DCOP to retrieve now playing info from Noatun.
- *
- * @author chris
- */
-public class NoatunSource implements MediaSource {
-    
-    /** Instantiates the media source. */
-    public NoatunSource() {
-        //Do nothing
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isRunning() {       
-        return DcopPlugin.getDcopResult("dcop noatun Noatun state").size() > 0;
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isPlaying() {
-        final String result = DcopPlugin.getDcopResult("dcop noatun Noatun state").get(0);
-        
-        return "2".equals(result.trim());
-    }
-    
-    /** {@inheritDoc} */
-    public String getInformation() {
-        return DcopPlugin.getDcopResult("dcop noatun Noatun title").get(0);
-    }
-    
-    /** {@inheritDoc} */
-    public String getName() {
-        return "Noatun";
-    }
-    
-}

src/com/dmdirc/addons/mediasources/windows/GetMediaInfo.dpr

@@ -1,115 +0,0 @@
-{*
- * This application attempts to load mirc-compatible dlls for media source information
- * This will fail with anything that actually relies on knowing the mirc window
- * handles
- *
- * DMDirc - Open Source IRC Client
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *}
-program GetMediaInfo;
-{$MODE Delphi}
-
-uses Windows, sysutils;
-
-type
-	TLoadInfo = packed record
-		mVersion: DWORD;
-		mHwnd: HWND;
-		mKeep: Boolean;
-	end;
-	PLoadInfo = ^TLoadInfo;
-
-var
-	I: Integer;
-	Player: String;
-	MethodName: String;
-	DLL: HINST;
-	
-	Method: function (mWnd: HWND; aWnd: HWND; data: PChar; parms: PChar; show: boolean; nopause: boolean): integer; stdcall;
-	LoadDLLMethod: procedure (LoadInfo: PLoadInfo); stdcall;
-	UnloadDLLMethod: function (mTimeOut: integer): integer; stdcall;
-	LoadInfo: PLoadInfo;
-	Data: PChar;
-	Params: PChar;
-begin
-	// By default, assume fail.
-	ExitCode := 1;
-
-	if ParamCount > 1 then MethodName := paramstr(2) else MethodName := 'GetTrackName';
-	
-	if ParamCount > 0 then begin
-		Player := paramstr(1);
-		DLL := LoadLibrary(PChar(Player+'.dll'));
-		
-		if DLL <> HINST(0) then begin
-			// DLL Exists and is loaded, we need to try to call LoadDLL first
-			LoadInfo := new(PLoadInfo);
-			LoadInfo.mVersion := MakeLong(6, 30); // Pretend to be mirc 6.3
-			LoadInfo.mHwnd := HWND(nil);
-			LoadInfo.mKeep := false;
-			LoadDLLMethod := GetProcAddress(DLL, 'LoadDll');
-			if @LoadDLLMethod <> nil then LoadDLLMethod(LoadInfo);
-			
-			// Now the actual method we want!
-			Method := GetProcAddress(DLL, PChar(MethodName));
-			if @Method <> nil then begin
-				// mirc help says the maximum size for these are 900
-				// I use 1024 mostly cos its a nicer number, but also if for some reason
-				// more than the amount allocated here gets used by the DLL, we run into
-				// all sorts of horrible nasty memory issues!
-				// We don't actually use Params, but some DLLs might write to it, so
-				// we have to allocate it aswell to prevent previously mentioned memory
-				// issues!
-				try
-					GetMem(Data, 1024);
-					GetMem(Params, 1024);
-					I := Method(HWND(nil), HWND(nil), Data, Params, true, true);
-					if I = 3 then begin
-						writeln(Data);
-						ExitCode := 0;
-					end
-					else begin
-						writeln('Method Exists, but incompatible');
-						writeln('I: '+inttostr(I));
-						writeln('Data: '+Data);
-						writeln('Params: '+Params);
-					end;
-				finally
-					FreeMem(Data);
-					FreeMem(Params);
-				end;
-			end
-			else begin
-				writeln('No Method ('+MethodName+') Found');
-			end;
-			
-			// Now attempt to unload
-			UnloadDLLMethod := GetProcAddress(DLL, 'UnloadDll');
-			if @UnloadDLLMethod <> nil then UnloadDLLMethod(0);
-		end
-		else begin
-			writeln('No DLL ('+Player+'.dll) Found');
-		end;
-	end
-	else begin
-		writeln('No Player Given');
-	end;
-end.

src/com/dmdirc/addons/nowplaying/MediaSource.java

@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.nowplaying;
-
-/**
- * The media source describes one source of "now playing" information
- * (i.e., one method of getting information from one media player).
- * 
- * @author chris
- */
-public interface MediaSource {
-    
-    /**
-     * Determine if the application for this source is running or not.
-     * 
-     * @return True if this source is running, false otherwise
-     */
-    boolean isRunning();
-    
-    /**
-     * Determine if this source is currently playing or not.
-     * 
-     * @return True if this source is playing, false otherwise
-     */
-    boolean isPlaying();
-    
-    /**
-     * Retrieves a nicely formatted string containing the relevant information
-     * about the source media (such as artist and title).
-     * 
-     * @return The currently playing media
-     */
-    String getInformation();
-    
-    /**
-     * Retrieves the name of the application that this source is for.
-     * 
-     * @return This source's application name
-     */
-    String getName();
-
-}

src/com/dmdirc/addons/nowplaying/MediaSourceManager.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.nowplaying;
-
-import java.util.List;
-
-/**
- * The media source manager is a standard interface for an object that controls
- * one or more media sources.
- * 
- * @author chris
- */
-public interface MediaSourceManager {
-    
-    /**
-     * Retrieves the sources that this manager manages.
-     * 
-     * @return A list of sources that this manager manages
-     */
-    public List<MediaSource> getSources();
-    
-}

src/com/dmdirc/addons/nowplaying/plugin/ConfigPanel.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.nowplaying.plugin;
-
-import com.dmdirc.ui.swing.components.reorderablelist.ReorderableJList;
-import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
-
-import java.awt.BorderLayout;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-
-/**
- * Now playing plugin config panel.
- */
-public class ConfigPanel extends JPanel {
-    
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    
-    /** Media source order list. */
-    private ReorderableJList list;
-    
-    /** Media sources. */
-    private final List<String> sources;
-    
-    /** Creates a new instance of ConfigPanel. */
-    public ConfigPanel(final List<String> sources) {
-        super();
-        
-        this.sources = new LinkedList<String>(sources);
-        
-        initComponents();
-    }
-    
-    /** Initialises the components. */
-    private void initComponents() {
-        list = new ReorderableJList();
-        
-        for (String source : sources) {
-            list.getModel().addElement(source);
-        }
-        
-        setLayout(new BorderLayout(SMALL_BORDER, SMALL_BORDER));
-        
-        add(new JLabel("Media source order: "), BorderLayout.PAGE_START);
-        add(new JScrollPane(list), BorderLayout.CENTER);
-    }
-    
-    public List<String> getSources() {
-        final List<String> newSources = new LinkedList<String>();
-        
-        final Enumeration<?> values = list.getModel().elements();
-        
-        while (values.hasMoreElements()) {
-            newSources.add((String) values.nextElement());
-        }
-        
-        return newSources;
-    }
-}

src/com/dmdirc/addons/nowplaying/plugin/MediaSourceComparator.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.nowplaying.plugin;
-
-import com.dmdirc.addons.nowplaying.MediaSource;
-
-import java.io.Serializable;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Sorts media sources according to an ordered list of their names.
- *
- * @author chris
- */
-public class MediaSourceComparator implements Comparator<MediaSource>, Serializable {
-    
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    
-    /** The order that the sources should be checked. */
-    private final List<String> order;
-    
-    /**
-     * Creates a new instance of MediaSourceComparator.
-     * NB: The order list may be altered during comparisons.
-     *
-     * @param order An ordered list of media source names
-     */
-    public MediaSourceComparator(final List<String> order) {
-        this.order = order;
-    }
-
-    /** {@inheritDoc} */
-    public int compare(final MediaSource o1, final MediaSource o2) {
-        return getPosition(o1) - getPosition(o2);
-    }
-    
-    /**
-     * Retrieves the position of the source within the order list.
-     * If the source is not present it is appended to the list.
-     *
-     * @param source The media source to be tested
-     */
-    private int getPosition(final MediaSource source) {
-        if (!order.contains(source.getName())) {
-            order.add(source.getName());
-        }
-        
-        return order.indexOf(source.getName());
-    }
-    
-}

src/com/dmdirc/addons/nowplaying/plugin/NowPlayingCommand.java

@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.nowplaying.plugin;
-
-import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
-import com.dmdirc.addons.nowplaying.MediaSource;
-import com.dmdirc.commandparser.commands.ChatCommand;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-import java.util.List;
-
-/**
- * The now playing command retrieves the currently playing song from a
- * variety of media players.
- * @author chris
- */
-public final class NowPlayingCommand extends ChatCommand implements IntelligentCommand {
-    
-    /** The plugin that's using this command. */
-    final NowPlayingPlugin parent;
-    
-    /**
-     * Creates a new instance of NowPlayingCommand.
-     *
-     * @param parent The plugin that's instansiating this command
-     */
-    public NowPlayingCommand(final NowPlayingPlugin parent) {
-        super();
-        
-        this.parent = parent;
-        
-        CommandManager.registerCommand(this);
-    }
-    
-    /** {@inheritDoc} */
-    public void execute(final InputWindow origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final String ... args) {
-        if (args.length > 0 && args[0].equalsIgnoreCase("--sources")) {
-            doSourceList(origin, isSilent);
-        } else if (args.length > 0 && args[0].equalsIgnoreCase("--source")) {
-            if (args.length > 1) {
-                final String sourceName = args[1];
-                final MediaSource source = parent.getSource(sourceName);
-                
-                if (source == null) {
-                    sendLine(origin, isSilent, "commandError", "Source not found.");
-                } else {
-                    if (source.isRunning()) {
-                        target.sendAction("is playing " + source.getInformation());
-                    } else {
-                        sendLine(origin, isSilent, "commandError", "Source is not running.");
-                    }
-                }
-            } else {
-                sendLine(origin, isSilent, "commandError", "You must specify a source when using --source.");
-            }
-        } else {
-            if (parent.hasRunningSource()) {
-                target.sendAction("is playing " + parent.getBestSource().getInformation());
-            } else {
-                sendLine(origin, isSilent, "commandError", "No running media sources available.");
-            }
-        }
-    }
-    
-    /**
-     * Outputs a list of sources for the nowplaying command.
-     *
-     * @param origin The input window where the command was entered
-     * @param isSilent Whether this command is being silenced
-     */
-    private void doSourceList(final InputWindow origin, final boolean isSilent) {
-        final List<MediaSource> sources = parent.getSources();
-        
-        if (sources.isEmpty()) {
-            sendLine(origin, isSilent, "commandError", "No media sources available.");
-        } else {
-            String status;
-            
-            for (MediaSource source : sources) {
-                if (source.isRunning()) {
-                    if (source.isPlaying()) {
-                        status = "playing: " + source.getInformation();
-                    } else {
-                        status = "paused: " + source.getInformation();
-                    }
-                } else {
-                    status = "not running";
-                }
-                sendLine(origin, isSilent, "commandOutput", source.getName() + ": " + status);
-            }
-        }
-    }
-    
-    /** {@inheritDoc}. */
-    public String getName() {
-        return "nowplaying";
-    }
-    
-    /** {@inheritDoc}. */
-    public boolean showInHelp() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc}. */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc}. */
-    public String getHelp() {
-        return "nowplaying [--sources|--source <source>] - tells the channel the song you're currently playing";
-    }
-    
-    /** {@inheritDoc} */
-    public AdditionalTabTargets getSuggestions(int arg, List<String> previousArgs) {
-        final AdditionalTabTargets res = new AdditionalTabTargets();
-        
-        res.setIncludeNormal(false);
-        
-        if (arg == 0) {
-            res.add("--sources");
-            res.add("--source");
-        } else if (arg == 1 && previousArgs.get(0).equalsIgnoreCase("--source")) {
-            for (MediaSource source : parent.getSources()) {
-                if (source.isRunning()) {
-                    res.add(source.getName());
-                }
-            }
-        }
-        
-        return res;
-    }
-    
-}

src/com/dmdirc/addons/nowplaying/plugin/NowPlayingPlugin.java

@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.nowplaying.plugin;
-
-import com.dmdirc.Main;
-import com.dmdirc.actions.ActionType;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.nowplaying.MediaSource;
-import com.dmdirc.addons.nowplaying.MediaSourceManager;
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.plugins.EventPlugin;
-import com.dmdirc.plugins.Plugin;
-import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.interfaces.PreferencesInterface;
-import com.dmdirc.ui.interfaces.PreferencesPanel;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-public class NowPlayingPlugin extends Plugin implements EventPlugin,
-        PreferencesInterface  {
-    
-    /** Config domain. */
-    private static final String DOMAIN = "plugin-nowplaying";
-    
-    /** The sources that we know of. */
-    private final List<MediaSource> sources = new ArrayList<MediaSource>();
-    
-    /** The now playing command we're registering. */
-    private NowPlayingCommand command;
-    
-    /** Config panel. */
-    private ConfigPanel configPanel;
-    
-    /** The user's preferred order for source usage. */
-    private List<String> order;
-    
-    public NowPlayingPlugin() {
-        super();
-    }
-    
-    /** {@inheritDoc} */
-    public boolean onLoad() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    protected void onActivate() {
-        sources.clear();
-        
-        loadSettings();
-        
-        for (Plugin target : PluginManager.getPluginManager().getPlugins()) {
-            if (target.isActive()) {
-                addPlugin(target);
-            }
-        }
-        
-        command = new NowPlayingCommand(this);
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    protected void onDeactivate() {
-        sources.clear();
-        
-        CommandManager.unregisterCommand(command);
-    }
-    
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.2";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Adds a nowplaying command";
-    }
-    
-    /** {@inheritDoc} */
-    public String toString() {
-        return "Now playing command";
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isConfigurable() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public void showConfig() {
-        final PreferencesPanel preferencesPanel = Main.getUI().getPreferencesPanel(this, "Now playing Plugin - Config");
-        
-        configPanel = new ConfigPanel(order);
-        
-        preferencesPanel.addCategory("General", "General options for the plugin.");
-        
-        preferencesPanel.replaceOptionPanel("General", configPanel);
-        
-        preferencesPanel.display();
-    }
-    
-    /** {@inheritDoc} */
-    public void configClosed(final Properties properties) {
-        order = configPanel.getSources();
-        
-        saveSettings();
-    }
-    
-    /** {@inheritDoc} */
-    public void configCancelled() {
-        //Ignore
-    }
-    
-    /** Saves the plugins settings. */
-    private void saveSettings() {
-        IdentityManager.getConfigIdentity().setOption(DOMAIN, "sourceOrder", order);
-    }
-    
-    /** Loads the plugins settings. */
-    private void loadSettings() {
-        if (IdentityManager.getGlobalConfig().hasOption(DOMAIN, "sourceOrder")) {
-            order = IdentityManager.getGlobalConfig().getOptionList(DOMAIN, "sourceOrder");
-        } else {
-            order = new ArrayList<String>();
-        }
-    }
-    
-    /** {@inheritDoc} */
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (type == CoreActionType.PLUGIN_ACTIVATED) {
-            addPlugin((Plugin) arguments[0]);
-        } else if (type == CoreActionType.PLUGIN_DEACTIVATED) {
-            removePlugin((Plugin) arguments[0]);
-        }
-    }
-    
-    /**
-     * Checks to see if a plugin implements one of the Media Source interfaces
-     * and if it does, adds the source(s) to our list.
-     *
-     * @param target The plugin to be tested
-     */
-    private void addPlugin(final Plugin target) {
-        if (target instanceof MediaSource) {
-            sources.add((MediaSource) target);
-            addSourceToOrder((MediaSource) target);
-        }
-        
-        if (target instanceof MediaSourceManager) {
-            sources.addAll(((MediaSourceManager) target).getSources());
-            
-            for (MediaSource source : ((MediaSourceManager) target).getSources()) {
-                addSourceToOrder(source);
-            }
-        }
-    }
-    
-    /**
-     * Checks to see if the specified media source needs to be added to our
-     * order list, and adds it if neccessary.
-     *
-     * @param source The media source to be tested
-     */
-    private void addSourceToOrder(final MediaSource source) {
-        if (!order.contains(source.getName())) {
-            order.add(source.getName());
-        }
-    }
-    
-    /**
-     * Checks to see if a plugin implements one of the Media Source interfaces
-     * and if it does, removes the source(s) from our list.
-     *
-     * @param target The plugin to be tested
-     */
-    private void removePlugin(final Plugin target) {
-        if (target instanceof MediaSource) {
-            sources.remove((MediaSource) target);
-        }
-        
-        if (target instanceof MediaSourceManager) {
-            sources.removeAll(((MediaSourceManager) target).getSources());
-        }
-    }
-    
-    /**
-     * Determines if there are any valid sources (paused or not).
-     *
-     * @return True if there are running sources, false otherwise
-     */
-    public boolean hasRunningSource() {
-        for (final MediaSource source : sources) {
-            if (source.isRunning()) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-    
-    /**
-     * Retrieves the "best" source to use for displaying media information.
-     * The best source is defined as the earliest in the list that is running
-     * and not paused, or, if no such source exists, the earliest in the list
-     * that is running and paused. If neither condition is satisified returns
-     * null.
-     *
-     * @return The best source to use for media info
-     */
-    public MediaSource getBestSource() {
-        MediaSource paused = null;
-        
-        Collections.sort(sources, new MediaSourceComparator(order));
-        
-        for (final MediaSource source : sources) {
-            if (source.isRunning()) {
-                if (source.isPlaying()) {
-                    return source;
-                } else if (paused == null) {
-                    paused = source;
-                }
-            }
-        }
-        
-        return paused;
-    }
-    
-    /**
-     * Retrieves a source based on its name.
-     *
-     * @param name The name to search for
-     * @return The source with the specified name or null if none were found.
-     */
-    public MediaSource getSource(final String name) {
-        for (final MediaSource source : sources) {
-            if (source.getName().equalsIgnoreCase(name)) {
-                return source;
-            }
-        }
-        
-        return null;
-    }
-    
-    /**
-     * Retrieves all the sources registered with this plugin.
-     *
-     * @return All known media sources
-     */
-    public List<MediaSource> getSources() {
-        return new ArrayList<MediaSource>(sources);
-    }
-}

src/com/dmdirc/addons/redirectplugin/FakeInputWindow.java

@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.redirectplugin;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.MessageTarget;
-import com.dmdirc.util.StringTranscoder;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.messages.Formatter;
-
-import java.beans.PropertyVetoException;
-import java.nio.charset.Charset;
-
-import javax.swing.Icon;
-
-/**
- * Implements a fake input window, which sends echoed text to the specified
- * chat window instead.
- * 
- * @author Chris
- */
-public class FakeInputWindow implements InputWindow {
-    
-    private final MessageTarget target;
-
-    /**
-     * Creates a new instance of FakeInputWindow.
-     * 
-     * @param target The message target that output gets sent to
-     */
-    public FakeInputWindow(final MessageTarget target) {
-        this.target = target;
-    }
-
-    /** {@inheritDoc} */
-    public CommandParser getCommandParser() {
-        return target.getFrame().getCommandParser();
-    }
-
-    /** {@inheritDoc} */
-    public InputHandler getInputHandler() {
-        return target.getFrame().getInputHandler();
-    }
-
-    /** {@inheritDoc} */
-    public void setAwayIndicator(final boolean isAway) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public void addLine(final String messageType, final Object... args) {
-        target.sendLine(Formatter.formatMessage(messageType, args));
-    }
-
-    /** {@inheritDoc} */
-    public void addLine(final StringBuffer messageType, final Object... args) {
-        addLine(messageType.toString(), args);
-    }
-
-    /** {@inheritDoc} */
-    public void addLine(final String line, final boolean timestamp) {
-        target.sendLine(line);
-    }
-
-    /** {@inheritDoc} */
-    public void clear() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public ConfigManager getConfigManager() {
-        return target.getFrame().getConfigManager();
-    }
-
-    /** {@inheritDoc} */
-    public FrameContainer getContainer() {
-        return target;
-    }
-
-    /** {@inheritDoc} */
-    public boolean isVisible() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    public void setVisible(final boolean isVisible) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public String getTitle() {
-        return "Fake window";
-    }
-
-    /** {@inheritDoc} */
-    public boolean isMaximum() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    public void setMaximum(final boolean b) throws PropertyVetoException {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public void setTitle(final String title) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public void open() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public void setFrameIcon(final Icon icon) {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    public StringTranscoder getTranscoder() {
-        return new StringTranscoder(Charset.defaultCharset());
-    }
-
-}

src/com/dmdirc/addons/redirectplugin/RedirectCommand.java

@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.redirectplugin;
-
-import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
-import com.dmdirc.commandparser.commands.ChatCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-/**
- * The redirect command allows the user to redirect the output from another
- * command that would normally echo results locally to a query or channel
- * window instead.
- *
- * @author Chris
- */
-public class RedirectCommand extends ChatCommand {
-    
-    public RedirectCommand() {
-    }
-    
-    /** {@inheritDoc} */
-    public void execute(final InputWindow origin, final Server server,
-            final MessageTarget target, final boolean isSilent, final String... args) {
-        target.getFrame().getCommandParser().parseCommand(new FakeInputWindow(target), implodeArgs(args));
-    }
-    
-    /** {@inheritDoc} */
-    public String getName() {
-        return "redirect";
-    }
-    
-    /** {@inheritDoc} */
-    public boolean showInHelp() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public boolean isPolyadic() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public int getArity() {
-        return 0;
-    }
-    
-    /** {@inheritDoc} */
-    public String getHelp() {
-        return "redirect <command> - sends the output of the command to a channel or query window";
-    }
-    
-}

src/com/dmdirc/addons/redirectplugin/RedirectPlugin.java

@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.redirectplugin;
-
-import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.plugins.Plugin;
-    
-
-/**
- * The redirect plugin allows the suer to redirect the output of commands that
- * would normally echo their results locally to a channel or chat window instead.
- * 
- * @author chris
- */
-public final class RedirectPlugin extends Plugin {
-    
-    private RedirectCommand command;
-    
-    /** Creates a new system tray plugin. */
-    public RedirectPlugin() {
-        super();
-        
-        command = new RedirectCommand();
-    }
-    
-    /** {@inheritDoc} */
-    public boolean onLoad() {
-        return true;
-    }
-    
-    /** {@inheritDoc} */
-    public void onActivate() {
-        CommandManager.registerCommand(command);
-    }
-    
-    /** {@inheritDoc}. */
-    public void onDeactivate() {
-        CommandManager.unregisterCommand(command);
-    }
-    
-    /** {@inheritDoc} */
-    public String getVersion() {
-        return "0.1";
-    }
-    
-    /** {@inheritDoc} */
-    public String getAuthor() {
-        return "Chris <chris@dmdirc.com>";
-    }
-    
-    /** {@inheritDoc} */
-    public String getDescription() {
-        return "Adds commands to redirect command output to channels";
-    }
-    
-    /** {@inheritDoc}. */
-    public String toString() {
-        return "Redirect Plugin";
-    }
-}

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.windowstatus;
-
-import java.awt.BorderLayout;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-
-import com.dmdirc.Channel;
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Main;
-import com.dmdirc.Query;
-import com.dmdirc.Server;
-import com.dmdirc.actions.ActionType;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.Identity;
-import com.dmdirc.parser.ChannelClientInfo;
-import com.dmdirc.parser.ChannelInfo;
-import com.dmdirc.parser.ClientInfo;
-import com.dmdirc.plugins.Plugin;
-import com.dmdirc.plugins.EventPlugin;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.interfaces.PreferencesInterface;
-import com.dmdirc.ui.interfaces.PreferencesPanel;
-import com.dmdirc.ui.interfaces.Window;
-import java.util.Map.Entry;
-
-/**
- * Displays information related to the current window in the status bar.
- *
- * @author Shane 'Dataforce' McCormack
- * @version $Id: WindowStatusPlugin.java 969 2007-04-30 18:38:20Z ShaneMcC $
- */
-public final class WindowStatusPlugin extends Plugin implements EventPlugin, PreferencesInterface {
-	/** What domain do we store all settings in the global config under. */
-	private static final String MY_DOMAIN = "plugin-Logging";
-	
-	/** The panel we use in the status bar. */
-	private final JPanel panel = new JPanel();
-	
-	/** The label we use to show window status. */
-	private final JLabel label = new JLabel(" ??? ");
-	
-	/** Creates a new instance of WindowStatusPlugin. */
-	public WindowStatusPlugin() {
-		super();
-		//		panel.setPreferredSize(new Dimension(70, 25));
-		panel.setLayout(new BorderLayout());
-		panel.setBorder(BorderFactory.createEtchedBorder());
-		label.setHorizontalAlignment(SwingConstants.CENTER);
-		panel.add(label);
-	}
-	
-	/**
-	 * Called when the plugin is loaded.
-	 *
-	 * @return false if the plugin can not be loaded
-	 */
-	public boolean onLoad() {
-		// Set defaults
-		Properties defaults = new Properties();
-		defaults.setProperty(MY_DOMAIN + "channel.shownone", "true");
-		defaults.setProperty(MY_DOMAIN + "channel.noneprefix", "None:");
-		defaults.setProperty(MY_DOMAIN + "client.showname", "false");
-		defaults.setProperty("identity.name", "WindowStatus Plugin Defaults");
-		IdentityManager.addIdentity(new Identity(defaults));
-		
-		return true;
-	}
-	
-	/**
-	 * Called when this plugin is Activated.
-	 */
-	public void onActivate() {
-		Main.getUI().getStatusBar().addComponent(panel);
-		updateStatus();
-	}
-	
-	/**
-	 * Called when this plugin is deactivated.
-	 */
-	public void onDeactivate() {
-		Main.getUI().getStatusBar().removeComponent(panel);
-	}
-	
-	/**
-	 * Get the plugin version.
-	 *
-	 * @return Plugin Version
-	 */
-	public String getVersion() { return "0.4"; }
-	
-	/**
-	 * Get the plugin Author.
-	 *
-	 * @return Author of plugin
-	 */
-	public String getAuthor() { return "Shane <shane@dmdirc.com>"; }
-	
-	/**
-	 * Get the plugin Description.
-	 *
-	 * @return Description of plugin
-	 */
-	public String getDescription() { return "Displays information related to the current window in the status bar."; }
-	
-	/**
-	 * Get the name of the plugin (used in "Manage Plugins" dialog).
-	 *
-	 * @return Name of plugin
-	 */
-	public String toString() { return "WindowStatus Plugin"; }
-	
-	/**
-	 * Process an event of the specified type.
-	 *
-	 * @param type The type of the event to process
-	 * @param format Format of messages that are about to be sent. (May be null)
-	 * @param arguments The arguments for the event
-	 */
-	public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
-		if (type instanceof CoreActionType) {
-			final CoreActionType thisType = (CoreActionType)type;
-			switch (thisType) {
-			case CLIENT_FRAME_CHANGED:
-				updateStatus((FrameContainer)arguments[0]);
-				break;
-			default:
-				break;
-			}
-		}
-	}
-	
-	/**
-	 * Update the window status using the current active window.
-	 */
-	public void updateStatus() {
-		Window active = Main.getUI().getMainWindow().getActiveFrame();
-		
-		if (active != null) {
-			FrameContainer activeFrame = ((InputWindow) active).getContainer();
-			updateStatus(activeFrame);
-		}
-	}
-	
-	/**
-	 * Update the window status using a given FrameContainer as the active frame.
-	 *
-	 * @param current Window to use when adding status.
-	 */
-	public void updateStatus(final FrameContainer current) {
-		if (current == null) { return; }
-		StringBuffer textString = new StringBuffer("");
-		
-		if (current instanceof Server) {
-			Server frame = (Server)current;
-			
-			textString.append(frame.getName());
-		} else if (current instanceof Channel) {
-			final Channel frame = (Channel)current;
-			final ChannelInfo chan = frame.getChannelInfo();
-			final Hashtable<Integer,String> names = new Hashtable<Integer,String>();
-			final Hashtable<Integer,Integer> types = new Hashtable<Integer,Integer>();
-			
-			textString.append(chan.getName());
-			textString.append(" - Nicks: "+chan.getUserCount()+" (");
-			
-			for (ChannelClientInfo client : chan.getChannelClients()) {
-				Integer im = client.getImportantModeValue();
-				
-				if (!names.containsKey(im)) {
-					String mode = client.getImportantModePrefix();
-					
-					if (mode.isEmpty()) {
-						if (IdentityManager.getGlobalConfig().getOptionBool(MY_DOMAIN, "channel.shownone")) {
-							if (IdentityManager.getGlobalConfig().hasOption(MY_DOMAIN, "channel.noneprefix")) {
-								mode = IdentityManager.getGlobalConfig().getOption(MY_DOMAIN, "channel.noneprefix");
-							} else {
-								mode = "None:";
-							}
-						} else {
-							continue;
-						}
-					}
-					names.put(im, mode);
-				}
-				
-				Integer count = types.get(im);
-				
-				if (count == null) {
-					count = Integer.valueOf(1);
-				} else {
-					count = count+1;
-				}
-				types.put(im, count);
-			}
-			
-			boolean isFirst = true;
-			
-			for (Entry<Integer, Integer> entry : types.entrySet()) {
-				if (isFirst) { isFirst = false; } else { textString.append(" "); }
-				textString.append(names.get(entry.getKey())+entry.getValue());
-			}
-			
-			textString.append(")");
-		} else if (current instanceof Query) {
-			final Query frame = (Query)current;
-			
-			textString.append(frame.getHost());
-			if (IdentityManager.getGlobalConfig().getOptionBool(MY_DOMAIN, "client.showname")) {
-				final ClientInfo client = frame.getServer().getParser().getClientInfo(frame.getHost());
-				if (client != null) {
-					final String realname = client.getRealName();
-					if (!realname.isEmpty()) {
-						textString.append(" - "+client.getRealName());
-					}
-				}
-			}
-		}
-		label.setText(" "+textString.toString()+" ");
-	}
-	
-	/**
-	 * Called to see if the plugin has configuration options (via dialog).
-	 *
-	 * @return true if the plugin has configuration options via a dialog.
-	 */
-	public boolean isConfigurable() { return true; }
-	
-	/**
-	 * Called to show the Configuration dialog of the plugin if appropriate.
-	 */
-	public void showConfig() {
-		final PreferencesPanel preferencesPanel = Main.getUI().getPreferencesPanel(this, "Window Status Plugin - Config");
-		preferencesPanel.addCategory("Channel", "Configuration for Window Status plugin when showing a channel window.");
-		preferencesPanel.addCategory("Client", "Configuration for Window Status plugin when showing a client window.");
-		
-		preferencesPanel.addCheckboxOption("Channel", "channel.shownone", "Show 'none' count: ", "Should the count for uses with no state be shown?", IdentityManager.getGlobalConfig().getOptionBool(MY_DOMAIN, "channel.shownone"));
-		preferencesPanel.addTextfieldOption("Channel", "channel.noneprefix", "Prefix used before 'none' count: ", "The Prefix to use when showing the 'none' count", IdentityManager.getGlobalConfig().getOption(MY_DOMAIN, "channel.noneprefix"));
-		
-		preferencesPanel.addCheckboxOption("Client", "client.showname", "Show Client realname if known: ", "Should the realname for clients be shown if known?", IdentityManager.getGlobalConfig().getOptionBool(MY_DOMAIN, "client.showname"));
-		preferencesPanel.display();
-	}
-	
-	/**
-	 * Get the name of the domain we store all settings in the global config under.
-	 *
-	 * @return the plugins domain
-	 */
-	protected static String getDomain() { return MY_DOMAIN; }
-	
-	/**
-	 * Copy the new vaule of an option to the global config.
-	 *
-	 * @param properties Source of option value, or null if setting default values
-	 * @param name name of option
-	 */
-	protected void updateOption(final Properties properties, final String name) {
-		String value = null;
-		
-		// Get the value from the properties file if one is given, else use the
-		// value from the global config.
-		if (properties != null) {
-			value = properties.getProperty(name);
-		} else {
-			value = IdentityManager.getGlobalConfig().getOption(MY_DOMAIN, name);
-		}
-		
-		// Check if the Value exists
-		if (value != null) {
-			// It does, so update the global config with the new value
-			IdentityManager.getConfigIdentity().setOption(MY_DOMAIN, name, value);
-		}
-	}
-	
-	/**
-	 * Called when the preferences dialog is closed.
-	 *
-	 * @param properties user preferences
-	 */
-	public void configClosed(final Properties properties) {
-		// Update Config options
-		updateOption(properties, "channel.shownone");
-		updateOption(properties, "channel.noneprefix");
-		updateOption(properties, "client.showname");
-		// Update Status bar
-		updateStatus();
-	}
-	
-	/**
-	 * Called when the preferences dialog is cancelled.
-	 */
-	public void configCancelled() { }
-}

src/com/dmdirc/addons/windowstatus/package-info.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * Adds information about the current window to the status bar.
- */
-package com.dmdirc.addons.windowstatus;