notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2657 - in development/main/transit/core/handler/src/main/net/dpml/transit: manager model

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2657 - in development/main/transit/core/handler/src/main/net/dpml/transit: manager model
Date: Mon, 23 May 2005 10:47:09 +0000

Author: mcconnell AT dpml.net
Date: Mon May 23 10:47:06 2005
New Revision: 2657

Added:

development/main/transit/core/handler/src/main/net/dpml/transit/manager/PluginManager.java
- copied, changed from r2644,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java
Removed:

development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java
Modified:

development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/ContentManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/ProxyManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitModel.java
Log:
Improve naming.

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/CacheManager.java
Mon May 23 10:47:06 2005
@@ -55,7 +55,7 @@
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z
mcconnell AT dpml.net $
*/
-public class CacheManager extends AbstractPluginManager
+public class CacheManager extends PluginManager
implements CacheModel, NodeChangeListener , PluginListener
{
private final List m_list = new LinkedList();

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/ContentManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/ContentManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/ContentManager.java
Mon May 23 10:47:06 2005
@@ -39,7 +39,7 @@
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: HostManager.java 2480 2005-05-10 04:44:32Z
mcconnell AT dpml.net $
*/
-public class ContentManager extends AbstractPluginManager implements
ContentModel
+public class ContentManager extends PluginManager implements ContentModel
{
//----------------------------------------------------------------------
// state

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/HostManager.java
Mon May 23 10:47:06 2005
@@ -58,7 +58,7 @@
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: HostManager.java 2480 2005-05-10 04:44:32Z
mcconnell AT dpml.net $
*/
-public class HostManager extends AbstractPluginManager implements HostModel
+public class HostManager extends PluginManager implements HostModel
{
private final String m_id;

Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/PluginManager.java
(from r2644,
development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/AbstractPluginManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/PluginManager.java
Mon May 23 10:47:06 2005
@@ -41,14 +41,14 @@
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z
mcconnell AT dpml.net $
*/
-abstract class AbstractPluginManager extends EventProducer implements
PluginModel, PreferenceChangeListener
+abstract class PluginManager extends EventProducer implements PluginModel,
PreferenceChangeListener
{
private final Preferences m_preferences;

private URI m_uri;
private Logger m_logger;

- public AbstractPluginManager( Logger logger, Preferences prefs )
+ public PluginManager( Logger logger, Preferences prefs )
{
if( null == logger )
{

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/ProxyManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/ProxyManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/ProxyManager.java
Mon May 23 10:47:06 2005
@@ -106,14 +106,18 @@

public void setProxyHost( String host )
{
+ Preferences prefs = getPreferences();
if( null == host )
{
- getPreferences().remove( "host" );
+ prefs.remove( "host" );
+ prefs.remove( "scheme" );
+ prefs.remove( "prompt" );
}
else
{
- Preferences prefs = getPreferences();
prefs.put( "host", host );
+ prefs.put( "scheme", "" );
+ prefs.put( "prompt", "" );
}
}

@@ -132,7 +136,7 @@
public void addExclude( String key )
{
Preferences excludes = getExcludesPreferences();
- excludes.put( key, null );
+ excludes.put( key, "" );
}

public void removeExclude( String key )

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RegistryManager.java
Mon May 23 10:47:06 2005
@@ -45,7 +45,7 @@
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z
mcconnell AT dpml.net $
*/
-public class RegistryManager extends AbstractPluginManager
+public class RegistryManager extends PluginManager
implements RegistryModel, NodeChangeListener, PluginListener
{
//
------------------------------------------------------------------------

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/RepositoryManager.java
Mon May 23 10:47:06 2005
@@ -34,7 +34,7 @@
* @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
* @version $Id: StandardTransitDirector.java 2480 2005-05-10 04:44:32Z
mcconnell AT dpml.net $
*/
-public class RepositoryManager extends AbstractPluginManager implements
RepositoryModel
+public class RepositoryManager extends PluginManager implements
RepositoryModel
{
public RepositoryManager( Logger logger, Preferences prefs )
{

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/manager/TransitManager.java
Mon May 23 10:47:06 2005
@@ -96,7 +96,7 @@
*
* @return the content director
*/
- public RegistryManager getContentRegistryManager()
+ public RegistryManager getRegistryManager()
{
return m_registry;
}
@@ -140,9 +140,9 @@
*
* @return the content director
*/
- public RegistryModel getContentRegistryModel()
+ public RegistryModel getRegistryModel()
{
- return getContentRegistryManager();
+ return getRegistryManager();
}

/**

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/TransitModel.java
Mon May 23 10:47:06 2005
@@ -42,7 +42,7 @@
*
* @return the content model
*/
- RegistryModel getContentRegistryModel();
+ RegistryModel getRegistryModel();

/**
* Return the model maintaining configuration information about

svn commit: r2657 - in development/main/transit/core/handler/src/main/net/dpml/transit: manager model, mcconnell, 05/23/2005