[Jnode-svn-commits] SF.net SVN: jnode:[5748] trunk/core/src

[<fd...@us...>]

Revision: 5748
          http://jnode.svn.sourceforge.net/jnode/?rev=5748&view=rev
Author:   fduminy
Date:     2010-05-12 10:29:02 +0000 (Wed, 12 May 2010)

Log Message:
-----------
removed depencency between Plugin and PluginDescriptorModel by using PluginDescriptor interface instead

Signed-off-by: Fabien DUMINY <fab...@we...>

Modified Paths:
--------------
    trunk/core/src/core/org/jnode/plugin/Plugin.java
    trunk/core/src/core/org/jnode/plugin/PluginDescriptor.java
    trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java
    trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java

Modified: trunk/core/src/core/org/jnode/plugin/Plugin.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/Plugin.java	2010-05-12 10:28:24 UTC (rev 5747)
+++ trunk/core/src/core/org/jnode/plugin/Plugin.java	2010-05-12 10:29:02 UTC (rev 5748)
@@ -24,7 +24,6 @@
 import java.security.PrivilegedAction;
 import java.util.prefs.Preferences;
 
-import org.jnode.plugin.model.PluginDescriptorModel;
 import org.jnode.system.BootLog;
 
 
@@ -109,7 +108,7 @@
                 try {
                     startPlugin();
                 } finally {
-                    ((PluginDescriptorModel) descriptor).firePluginStarted();
+                    descriptor.firePluginStarted();
                 }
             } catch (PluginException ex) {
                 throw ex;
@@ -134,7 +133,7 @@
             started = false;
             try {
                 try {
-                    ((PluginDescriptorModel) descriptor).firePluginStop();
+                    descriptor.firePluginStopped();
                 } finally {
                     stopPlugin();
                 }

Modified: trunk/core/src/core/org/jnode/plugin/PluginDescriptor.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/PluginDescriptor.java	2010-05-12 10:28:24 UTC (rev 5747)
+++ trunk/core/src/core/org/jnode/plugin/PluginDescriptor.java	2010-05-12 10:29:02 UTC (rev 5748)
@@ -20,7 +20,10 @@
  
 package org.jnode.plugin;
 
+import java.util.ArrayList;
+import java.util.List;
 
+
 /**
  * Descriptor of a Plugin.
  *
@@ -212,4 +215,14 @@
      * @param listener
      */
     public void removeListener(PluginDescriptorListener listener);
+    
+    /**
+     * Fire the pluginStarted event to this descriptor's listeners.
+     */
+    public void firePluginStarted();
+
+    /**
+     * Fire the pluginStopped event to this descriptor's listeners.
+     */
+    public void firePluginStopped();
 }

Modified: trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java
===================================================================
--- trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java	2010-05-12 10:28:24 UTC (rev 5747)
+++ trunk/core/src/core/org/jnode/plugin/model/PluginDescriptorModel.java	2010-05-12 10:29:02 UTC (rev 5748)
@@ -294,7 +294,7 @@
     }
 
     /**
-     * Fire the pluginStarted event to my listeners.
+     * {@inheritDoc}
      */
     public final void firePluginStarted() {
         final List<PluginDescriptorListener> listeners;
@@ -312,9 +312,9 @@
     }
 
     /**
-     * Fire the pluginStop event to my listeners.
+     * {@inheritDoc}
      */
-    public final void firePluginStop() {
+    public final void firePluginStopped() {
         final List<PluginDescriptorListener> listeners;
         synchronized (listenerLock) {
             if (this.listeners != null) {

Modified: trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java
===================================================================
--- trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java	2010-05-12 10:28:24 UTC (rev 5747)
+++ trunk/core/src/emu/org/jnode/emu/plugin/model/DummyPluginDescriptor.java	2010-05-12 10:29:02 UTC (rev 5748)
@@ -163,4 +163,12 @@
     public PluginReference getPluginReference() {
         return null;
     }
+
+	@Override
+	public void firePluginStarted() {
+	}
+
+	@Override
+	public void firePluginStopped() {
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.