notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r2858 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs depot/station/src/main/net/dpml/depot/station transit/core/handler/src/main/net/dpml/transit/home transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/main/net/dpml/transit/repository transit/core/handler/src/main/net/dpml/transit/runtime transit/core/handler/src/main/net/dpml/transit/unit
- From: mcconnell AT dpml.net
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r2858 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs depot/station/src/main/net/dpml/depot/station transit/core/handler/src/main/net/dpml/transit/home transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/main/net/dpml/transit/repository transit/core/handler/src/main/net/dpml/transit/runtime transit/core/handler/src/main/net/dpml/transit/unit
- Date: Tue, 14 Jun 2005 20:04:26 -0400
Author: mcconnell AT dpml.net
Date: Tue Jun 14 20:04:26 2005
New Revision: 2858
Added:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheEvent.java
- copied, changed from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostNodeEvent.java
Removed:
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostNodeEvent.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostTrustedEvent.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/ModificationEvent.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/ModificationListener.java
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
development/main/depot/console/src/main/net/dpml/depot/profile/DepotStorage.java
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheTableModel.java
development/main/depot/station/src/main/net/dpml/depot/station/ActivationGroupStorage.java
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java
development/main/transit/core/handler/src/main/net/dpml/transit/home/Home.java
development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheListener.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/DisposableCodeBaseModel.java
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostEvent.java
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/AbstractStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CodeBaseStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ProxyStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
Log:
Improvements to class naming.
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/DepotModel.java
Tue Jun 14 20:04:26 2005
@@ -28,11 +28,10 @@
import java.util.EventListener;
import net.dpml.transit.home.Home;
+import net.dpml.transit.model.DefaultModel;
+import net.dpml.transit.model.DuplicateKeyException;
import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.DefaultModel;
/**
* A ProfileModel maintains information about the configuration
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/DepotStorage.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/DepotStorage.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/DepotStorage.java
Tue Jun 14 20:04:26 2005
@@ -27,7 +27,6 @@
import net.dpml.transit.home.Home;
import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.unit.AbstractStorageUnit;
/**
Modified:
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/profile/Profile.java
Tue Jun 14 20:04:26 2005
@@ -26,7 +26,6 @@
import net.dpml.transit.home.Home;
import net.dpml.transit.model.Logger;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.DefaultModel;
import net.dpml.transit.model.Disposable;
import net.dpml.transit.model.DisposalEvent;
Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java
Tue Jun 14 20:04:26 2005
@@ -40,7 +40,7 @@
import net.dpml.transit.model.CacheModel;
import net.dpml.transit.model.CacheListener;
import net.dpml.transit.model.FileChangeEvent;
-import net.dpml.transit.model.HostNodeEvent;
+import net.dpml.transit.model.CacheEvent;
/**
* Control panel for editing the cache preferences.
@@ -150,7 +150,7 @@
* Notify the listener of the addition of a new host.
* @param event the host added event
*/
- public void hostAdded( HostNodeEvent event )
+ public void hostAdded( CacheEvent event )
{
// ignore
}
@@ -159,7 +159,7 @@
* Notify the listener of the removal of a host.
* @param event the host removed event
*/
- public void hostRemoved( HostNodeEvent event )
+ public void hostRemoved( CacheEvent event )
{
// ignore
}
Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheTableModel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheTableModel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheTableModel.java
Tue Jun 14 20:04:26 2005
@@ -24,7 +24,7 @@
import net.dpml.transit.Transit;
import net.dpml.transit.model.FileChangeEvent;
import net.dpml.transit.model.HostModel;
-import net.dpml.transit.model.HostNodeEvent;
+import net.dpml.transit.model.CacheEvent;
import net.dpml.transit.model.CacheListener;
import net.dpml.transit.model.CacheModel;
@@ -111,7 +111,7 @@
* Notify the listener of the addition of a new host.
* @param event the host added event
*/
- public void hostAdded( HostNodeEvent event )
+ public void hostAdded( CacheEvent event )
{
fireTableStructureChanged();
}
@@ -120,7 +120,7 @@
* Notify the listener of the removal of a host.
* @param event the host removed event
*/
- public void hostRemoved( HostNodeEvent event )
+ public void hostRemoved( CacheEvent event )
{
fireTableStructureChanged();
}
Modified:
development/main/depot/station/src/main/net/dpml/depot/station/ActivationGroupStorage.java
==============================================================================
---
development/main/depot/station/src/main/net/dpml/depot/station/ActivationGroupStorage.java
(original)
+++
development/main/depot/station/src/main/net/dpml/depot/station/ActivationGroupStorage.java
Tue Jun 14 20:04:26 2005
@@ -28,7 +28,6 @@
import net.dpml.transit.model.Logger;
import net.dpml.transit.home.Home;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.depot.profile.ProfileException;
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/ContentHome.java
Tue Jun 14 20:04:26 2005
@@ -26,6 +26,4 @@
public interface ContentHome extends CodeBaseHome
{
void setTitle( String title );
-
- void destroy();
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/Home.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/Home.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/Home.java
Tue Jun 14 20:04:26 2005
@@ -18,9 +18,6 @@
package net.dpml.transit.home;
-import net.dpml.transit.model.DisposalListener;
-import net.dpml.transit.model.ModificationListener;
-
/**
* The ProxyManager is an interface implemented by proxy managers.
*
@@ -29,5 +26,6 @@
public interface Home
{
boolean isReadOnly();
+
boolean isMutable();
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/HostHome.java
Tue Jun 14 20:04:26 2005
@@ -40,6 +40,4 @@
void setLayoutModel( LayoutModel layout );
- void destroy();
-
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/home/LayoutHome.java
Tue Jun 14 20:04:26 2005
@@ -28,6 +28,4 @@
void setTitle( String title );
void setClassname( String classname );
-
- void destroy();
}
Copied:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheEvent.java
(from r2845,
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostNodeEvent.java)
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostNodeEvent.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheEvent.java
Tue Jun 14 20:04:26 2005
@@ -23,16 +23,21 @@
/**
* An event related to the addition or removal of a host.
*/
-public abstract class HostNodeEvent extends EventObject
+public abstract class CacheEvent extends EventObject
{
private final HostModel m_host;
- public HostNodeEvent( CacheModel source, HostModel host )
+ public CacheEvent( CacheModel source, HostModel host )
{
super( source );
m_host = host;
}
+ public CacheModel getCacheModel()
+ {
+ return (CacheModel) getSource();
+ }
+
public HostModel getHostModel()
{
return m_host;
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheListener.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheListener.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheListener.java
Tue Jun 14 20:04:26 2005
@@ -35,12 +35,12 @@
* Notify the listener of the addition of a new host.
* @param event the host added event
*/
- void hostAdded( HostNodeEvent event );
+ void hostAdded( CacheEvent event );
/**
* Notify the listener of the removal of a host.
* @param event the host removed event
*/
- void hostRemoved( HostNodeEvent event );
+ void hostRemoved( CacheEvent event );
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
Tue Jun 14 20:04:26 2005
@@ -42,9 +42,7 @@
import net.dpml.transit.Transit;
import net.dpml.transit.TransitError;
-
import net.dpml.transit.home.CacheHome;
-
import net.dpml.transit.util.PropertyResolver;
/**
@@ -251,7 +249,6 @@
m_list.add( manager );
if( notify )
{
- setModified();
HostAddedEvent event = new HostAddedEvent( this, manager
);
enqueueEvent( event );
}
@@ -313,9 +310,9 @@
public void processEvent( EventObject event )
{
- if( event instanceof HostNodeEvent )
+ if( event instanceof CacheEvent )
{
- processHostEvent( (HostNodeEvent) event );
+ processCacheEvent( (CacheEvent) event );
}
else if( event instanceof CacheDirectoryChangeEvent )
{
@@ -327,7 +324,7 @@
}
}
- private void processHostEvent( HostNodeEvent event )
+ private void processCacheEvent( CacheEvent event )
{
EventListener[] listeners = super.listeners();
for( int i=0; i<listeners.length; i++ )
@@ -394,7 +391,7 @@
return Transit.DPML_DATA;
}
- static class HostAddedEvent extends HostNodeEvent
+ static class HostAddedEvent extends CacheEvent
{
private int m_priority;
@@ -404,7 +401,7 @@
}
}
- static class HostRemovedEvent extends HostNodeEvent
+ static class HostRemovedEvent extends CacheEvent
{
public HostRemovedEvent( CacheModel source, HostModel host )
{
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultContentModel.java
Tue Jun 14 20:04:26 2005
@@ -24,6 +24,7 @@
import java.util.Date;
import net.dpml.transit.home.ContentHome;
+import net.dpml.transit.home.Removable;
/**
* Default implementation of a content manager that maintains an active
@@ -119,7 +120,11 @@
public void dispose()
{
super.dispose();
- m_home.destroy();
+ if( m_home.isMutable() && ( m_home instanceof Removable ) )
+ {
+ Removable store = (Removable) m_home;
+ store.remove();
+ }
}
//
------------------------------------------------------------------------
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultHostModel.java
Tue Jun 14 20:04:26 2005
@@ -31,6 +31,7 @@
import java.net.PasswordAuthentication;
import net.dpml.transit.home.HostHome;
+import net.dpml.transit.home.Removable;
import net.dpml.transit.network.RequestIdentifier;
@@ -108,7 +109,11 @@
{
super.dispose();
m_layout.removeDisposalListener( this );
- m_home.destroy();
+ if( m_home.isMutable() && ( m_home instanceof Removable ) )
+ {
+ Removable store = (Removable) m_home;
+ store.remove();
+ }
}
//
------------------------------------------------------------------------
@@ -420,7 +425,6 @@
synchronized( m_lock )
{
m_enabled = enabled ;
- setModified();
}
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultLayoutModel.java
Tue Jun 14 20:04:26 2005
@@ -24,6 +24,7 @@
import java.util.Date;
import net.dpml.transit.home.LayoutHome;
+import net.dpml.transit.home.Removable;
/**
* Default implementation of a content manager that maintains an active
@@ -161,7 +162,11 @@
public void dispose()
{
super.dispose();
- m_home.destroy();
+ if( m_home.isMutable() && ( m_home instanceof Removable ) )
+ {
+ Removable store = (Removable) m_home;
+ store.remove();
+ }
}
//
------------------------------------------------------------------------
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultModel.java
Tue Jun 14 20:04:26 2005
@@ -134,49 +134,11 @@
// DefaultModel
//
------------------------------------------------------------------------
- protected void setModified()
+ protected void processEvent( EventObject event )
{
- m_modification = new Date();
- ModificationEvent e = new ModificationEvent( this, m_modification );
- enqueueEvent( e );
- }
-
- protected void processEvent( EventObject eventObject )
- {
- if( eventObject instanceof ModificationEvent )
- {
- ModificationEvent event = (ModificationEvent) eventObject;
- EventListener[] listeners = listeners();
- for( int i=0; i<listeners.length; i++ )
- {
- EventListener listener = listeners[i];
- if( listener instanceof ModificationListener )
- {
- ModificationListener pl = (ModificationListener)
listener;
- try
- {
- pl.modified( event );
- }
- catch( Throwable e )
- {
- final String error =
- "Modification listener notification error.";
- getLogger().error( error, e );
- }
- }
- }
- }
- else
- {
- final String error =
- "Event class not recognized: " +
eventObject.getClass().getName();
- throw new IllegalArgumentException( error );
- }
- }
-
- public Object[] getListeners()
- {
- return listeners();
+ final String error =
+ "Event class not recognized: " + event.getClass().getName();
+ throw new IllegalArgumentException( error );
}
/**
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DisposableCodeBaseModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DisposableCodeBaseModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DisposableCodeBaseModel.java
Tue Jun 14 20:04:26 2005
@@ -71,6 +71,7 @@
enqueueEvent( veto, false );
DisposalEvent disposal = new DisposalEvent( this );
enqueueEvent( disposal, false );
+
}
//----------------------------------------------------------------------
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostEvent.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostEvent.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/HostEvent.java
Tue Jun 14 20:04:26 2005
@@ -25,16 +25,13 @@
*/
public abstract class HostEvent extends EventObject
{
- private final HostModel m_host;
-
public HostEvent( HostModel source )
{
super( source );
- m_host = source;
}
public HostModel getHostModel()
{
- return m_host;
+ return (HostModel) getSource();
}
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/repository/StandardLoader.java
Tue Jun 14 20:04:26 2005
@@ -299,7 +299,7 @@
params[ args.length ] = classloader;
params[ args.length + 1 ] = descriptor;
params[ args.length + 2 ] = this;
- return instantiate( null, clazz, params );
+ return instantiate( clazz, params );
}
public Object instantiate( Class clazz, Object[] args ) throws
RepositoryException
@@ -309,22 +309,17 @@
{
throw new NullArgumentException( "clazz" );
}
- return instantiate( null, clazz, args );
- }
-
- protected Object instantiate( Class parent, Class clazz, Object[] args )
throws RepositoryException
- {
Constructor constructor = getSingleConstructor( clazz );
- return instantiate( parent, constructor, args );
+ return instantiate( constructor, args );
}
- protected Object instantiate( Class parent, Constructor constructor,
Object[] args ) throws RepositoryException
+ protected Object instantiate( Constructor constructor, Object[] args )
throws RepositoryException
{
- Object[] arguments = populate( parent, constructor, args );
+ Object[] arguments = populate( constructor, args );
return newInstance( constructor, arguments );
}
- protected Object[] populate( Class parent, Constructor constructor,
Object[] args ) throws RepositoryException
+ protected Object[] populate( Constructor constructor, Object[] args )
throws RepositoryException
{
if( null == constructor )
{
@@ -381,32 +376,12 @@
}
else
{
- try
- {
- arguments[i] = instantiate( parent, c, args );
- }
- catch( RepositoryException e )
- {
- if( null != parent )
- {
- final String error =
- "Unable to resolve a nested value for a
constructor parameter parameter."
- + "\nEnclosing class: "+ parent.getName()
- + "\nConstructor class: " +
constructor.getDeclaringClass().getName()
- + "\nParameter class: " + c.getName()
- + "\nParameter position: " + ( i + 1 );
- throw new RepositoryException( error, e );
- }
- else
- {
- final String error =
- "Unable to resolve a value for a constructor
parameter parameter."
- + "\nConstructor class: " +
constructor.getDeclaringClass().getName()
- + "\nParameter class: " + c.getName()
- + "\nParameter position: " + ( i + 1 );
- throw new RepositoryException( error, e );
- }
- }
+ final String error =
+ "Unable to resolve a value for a constructor parameter
parameter."
+ + "\nConstructor class: " +
constructor.getDeclaringClass().getName()
+ + "\nParameter class: " + c.getName()
+ + "\nParameter position: " + ( i + 1 );
+ throw new RepositoryException( error );
}
}
}
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/runtime/DefaultCacheHandler.java
Tue Jun 14 20:04:26 2005
@@ -49,7 +49,7 @@
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.FileChangeEvent;
import net.dpml.transit.model.HostModel;
-import net.dpml.transit.model.HostNodeEvent;
+import net.dpml.transit.model.CacheEvent;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
import net.dpml.transit.monitors.CacheMonitorRouter;
@@ -185,7 +185,7 @@
* Notify the listener of the addition of a new host.
* @param event the host added event
*/
- public void hostAdded( HostNodeEvent event )
+ public void hostAdded( CacheEvent event )
{
HostModel host = event.getHostModel();
try
@@ -204,7 +204,7 @@
* Notify the listener of the removal of a host.
* @param event the host removed event
*/
- public void hostRemoved( HostNodeEvent event )
+ public void hostRemoved( CacheEvent event )
{
synchronized( m_resourceHosts )
{
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/AbstractStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/AbstractStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/AbstractStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -26,8 +26,6 @@
import java.util.prefs.Preferences;
import java.util.prefs.BackingStoreException;
-import net.dpml.transit.model.ModificationEvent;
-import net.dpml.transit.model.ModificationListener;
import net.dpml.transit.model.DisposalEvent;
import net.dpml.transit.model.DisposalListener;
import net.dpml.transit.model.Logger;
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CacheStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -26,18 +26,16 @@
import java.util.prefs.BackingStoreException;
import net.dpml.transit.home.CacheHome;
+import net.dpml.transit.home.Removable;
import net.dpml.transit.model.DefaultCacheModel;
+import net.dpml.transit.model.DuplicateKeyException;
import net.dpml.transit.model.CacheModel;
import net.dpml.transit.model.ContentRegistryModel;
-import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.HostModel;
-import net.dpml.transit.model.ModificationEvent;
+import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.util.PropertyResolver;
@@ -45,7 +43,7 @@
* The LayoutRegistryHelper class provides support for the crreating of a
* ContentRegistryModel based on a supplied preferences node.
*/
-class CacheStorageUnit extends CodeBaseStorageUnit implements CacheHome
+class CacheStorageUnit extends CodeBaseStorageUnit implements CacheHome,
Removable
{
//
------------------------------------------------------------------------
// constructor
@@ -125,6 +123,15 @@
}
//
------------------------------------------------------------------------
+ // Removable
+ //
------------------------------------------------------------------------
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ //
------------------------------------------------------------------------
// impl
//
------------------------------------------------------------------------
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CodeBaseStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CodeBaseStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/CodeBaseStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -24,9 +24,6 @@
import java.util.Date;
import net.dpml.transit.home.CodeBaseHome;
-import net.dpml.transit.model.RepositoryModel;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.Logger;
/**
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentRegistryStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -27,7 +27,6 @@
import net.dpml.transit.model.DefaultContentRegistryModel;
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.DuplicateKeyException;
import net.dpml.transit.model.Logger;
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ContentStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -23,9 +23,9 @@
import java.util.prefs.BackingStoreException;
import net.dpml.transit.home.ContentHome;
+import net.dpml.transit.home.Removable;
import net.dpml.transit.model.DefaultContentModel;
import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.Logger;
@@ -33,7 +33,7 @@
* The ContentSorageUnit class is responsible for the setup of initial
factory
* default preference settings.
*/
-class ContentStorageUnit extends CodeBaseStorageUnit implements ContentHome
+class ContentStorageUnit extends CodeBaseStorageUnit implements ContentHome,
Removable
{
//
------------------------------------------------------------------------
// constructor
@@ -54,7 +54,11 @@
setValue( "title", title );
}
- public void destroy()
+ //
------------------------------------------------------------------------
+ // Removable
+ //
------------------------------------------------------------------------
+
+ public void remove()
{
try
{
@@ -65,6 +69,7 @@
getLogger().error( "storage removal failure", e );
}
}
+
//
------------------------------------------------------------------------
// impl
//
------------------------------------------------------------------------
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/HostStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -25,26 +25,25 @@
import java.net.PasswordAuthentication;
import net.dpml.transit.home.HostHome;
+import net.dpml.transit.home.Removable;
import net.dpml.transit.model.DefaultModel.Local;
import net.dpml.transit.model.DefaultModel.Plugin;
import net.dpml.transit.model.DefaultHostModel;
+import net.dpml.transit.model.DisposalEvent;
+import net.dpml.transit.model.DisposalListener;
import net.dpml.transit.model.HostModel;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
import net.dpml.transit.model.Model;
import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DisposalEvent;
-import net.dpml.transit.model.DisposalListener;
-import net.dpml.transit.model.Model;
import net.dpml.transit.runtime.DefaultResourceHost;
/**
* The LayoutHelper class is responsible for the setup of initial factory
* default preference settings.
*/
-class HostStorageUnit extends CodeBaseStorageUnit implements HostHome
+class HostStorageUnit extends CodeBaseStorageUnit implements HostHome,
Removable
{
//
------------------------------------------------------------------------
// state
@@ -112,7 +111,11 @@
}
}
- public void destroy()
+ //
------------------------------------------------------------------------
+ // Removable
+ //
------------------------------------------------------------------------
+
+ public void remove()
{
try
{
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutRegistryStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -30,7 +30,6 @@
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.DuplicateKeyException;
/**
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/LayoutStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -23,11 +23,11 @@
import java.util.prefs.BackingStoreException;
import net.dpml.transit.home.LayoutHome;
+import net.dpml.transit.home.Removable;
import net.dpml.transit.model.DefaultModel.Plugin;
import net.dpml.transit.model.DefaultModel.Local;
import net.dpml.transit.model.DefaultLayoutModel;
import net.dpml.transit.model.LayoutModel;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.DisposalEvent;
import net.dpml.transit.model.DisposalListener;
import net.dpml.transit.model.LayoutModel;
@@ -39,7 +39,7 @@
* The LayoutHelper class is responsible for the setup of initial factory
* default preference settings.
*/
-class LayoutStorageUnit extends CodeBaseStorageUnit implements LayoutHome
+class LayoutStorageUnit extends CodeBaseStorageUnit implements LayoutHome,
Removable
{
//
------------------------------------------------------------------------
// constructor
@@ -65,7 +65,11 @@
setValue( "classname", classname );
}
- public void destroy()
+ //
------------------------------------------------------------------------
+ // Removable
+ //
------------------------------------------------------------------------
+
+ public void remove()
{
try
{
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ProxyStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ProxyStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/ProxyStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -27,8 +27,6 @@
import net.dpml.transit.model.DefaultProxyModel;
import net.dpml.transit.model.Logger;
import net.dpml.transit.model.ProxyModel;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
/**
* The LayoutHelper class is responsible for the setup of initial factory
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/RepositoryStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -23,10 +23,9 @@
import java.util.prefs.BackingStoreException;
import java.util.Date;
+import net.dpml.transit.home.Removable;
import net.dpml.transit.home.RepositoryHome;
import net.dpml.transit.model.RepositoryModel;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
import net.dpml.transit.model.DefaultRepositoryModel;
import net.dpml.transit.model.Logger;
Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/unit/TransitStorageUnit.java
Tue Jun 14 20:04:26 2005
@@ -28,9 +28,7 @@
import net.dpml.transit.adapter.LoggingAdapter;
import net.dpml.transit.home.TransitHome;
-import net.dpml.transit.model.ModificationListener;
-import net.dpml.transit.model.ModificationEvent;
-import net.dpml.transit.model.VetoDisposalException;
+import net.dpml.transit.model.DefaultTransitModel;
import net.dpml.transit.model.DisposalListener;
import net.dpml.transit.model.DisposalEvent;
import net.dpml.transit.model.CacheModel;
@@ -39,9 +37,7 @@
import net.dpml.transit.model.ProxyModel;
import net.dpml.transit.model.RepositoryModel;
import net.dpml.transit.model.TransitModel;
-
-import net.dpml.transit.model.DefaultTransitModel;
-
+import net.dpml.transit.model.VetoDisposalException;
/**
*
- svn commit: r2858 - in development/main: depot/console/src/main/net/dpml/depot/profile depot/prefs/src/main/net/dpml/depot/prefs depot/station/src/main/net/dpml/depot/station transit/core/handler/src/main/net/dpml/transit/home transit/core/handler/src/main/net/dpml/transit/model transit/core/handler/src/main/net/dpml/transit/repository transit/core/handler/src/main/net/dpml/transit/runtime transit/core/handler/src/main/net/dpml/transit/unit, mcconnell, 06/14/2005
Archive powered by MHonArc 2.6.24.