DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Tue Jun 14 02:02:47 2005
New Revision: 2855

Modified:
   
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
   
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java
   
development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotModelPanel.java
Log:
housekeeping

Modified: 
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
==============================================================================
--- 
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
      (original)
+++ 
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfile.java
      Tue Jun 14 02:02:47 2005
@@ -31,8 +31,7 @@
  */
 public class ApplicationProfile extends Profile
 {
-    private final boolean m_system;
-
+    private boolean m_enabled;
     private URI m_uri;
     private boolean m_command;
     private Connection m_connection;
@@ -41,24 +40,17 @@
       Logger logger, Date creation, String id, String title, 
       Properties properties, boolean command, Connection connection, URI uri 
) 
     {
-        this( logger, creation, null, id, title, properties, command, 
connection, uri, false );
+        this( logger, creation, null, id, title, properties, command, 
connection, uri, true );
     }
 
     public ApplicationProfile( 
       Logger logger, Date creation, ProfileHome home, String id, String 
title, 
-      Properties properties, boolean command, Connection connection, URI uri 
) 
-    {
-        this( logger, creation, home, id, title, properties, command, 
connection, uri, false );
-    }
-
-    ApplicationProfile( 
-      Logger logger, Date creation, ProfileHome home, String id, String 
title, 
-      Properties properties, boolean command, Connection connection, URI 
uri, boolean system ) 
+      Properties properties, boolean command, Connection connection, URI 
uri, boolean enabled ) 
     {
         super( logger, creation, home, id, title, properties );
 
         m_uri = uri;
-        m_system = system;
+        m_enabled = enabled;
         m_connection = connection;
         m_command = command;
     }
@@ -67,9 +59,14 @@
     // impl
     //----------------------------------------------------------------------
 
-    public boolean isSystemProfile()
+    public boolean isEnabled()
+    {
+        return m_enabled;
+    }
+
+    public void setEnabled( boolean value )
     {
-        return m_system;
+        m_enabled = value;
     }
 
     public URI getURI()

Modified: 
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java
==============================================================================
--- 
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java
       (original)
+++ 
development/main/depot/console/src/main/net/dpml/depot/profile/ApplicationProfileStorage.java
       Tue Jun 14 02:02:47 2005
@@ -55,13 +55,6 @@
       Preferences prefs, Logger logger, Date creation, boolean policy ) 
       throws ProfileException
     {
-        this( prefs, logger, creation, policy, prefs.getBoolean( "system", 
false ) );
-    }
-
-    ApplicationProfileStorage( 
-      Preferences prefs, Logger logger, Date creation, boolean policy, 
boolean system ) 
-      throws ProfileException
-    {
         super( prefs, logger, creation, policy );
 
         String id = getID();
@@ -69,10 +62,11 @@
         Properties properties = getProperties();
         Connection connection = getConnection();
         boolean command = getCommandPolicy();
+        boolean enabled = getEnabled();
         URI uri = getPluginURI();
         m_profile = 
           new ApplicationProfile( 
-            logger, creation, this, id, title, properties, command, 
connection, uri, system );
+            logger, creation, this, id, title, properties, command, 
connection, uri, enabled );
     }
 
     protected URI getPluginURI() throws ProfileException
@@ -102,6 +96,12 @@
         }
     }
 
+    protected boolean getEnabled()
+    {
+        Preferences prefs = getPreferences();
+        return prefs.getBoolean( "enabled", true );
+    }
+
     protected boolean getCommandPolicy()
     {
         Preferences prefs = getPreferences();

Modified: 
development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotModelPanel.java
==============================================================================
--- 
development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotModelPanel.java
     (original)
+++ 
development/main/depot/prefs/src/main/net/dpml/depot/prefs/DepotModelPanel.java
     Tue Jun 14 02:02:47 2005
@@ -141,9 +141,8 @@
                 try
                 {
                     ApplicationProfile profile = 
m_model.getApplicationProfile( m_selection );
-                    boolean systemProfile = profile.isSystemProfile();
                     m_edit.setEnabled( true );
-                    m_delete.setEnabled( !systemProfile );
+                    m_delete.setEnabled( true );
                     getRootPane().setDefaultButton( m_edit );
                 }
                 catch( UnknownKeyException e )