donaldp 2002/09/07 05:28:36
Modified: monitor/src/java/org/apache/avalon/excalibur/monitor
FileResource.java Resource.java SourceResource.java
StreamResource.java
Log:
deprecate direct access of variables and instead use getters/setters
Revision Changes Path
1.6 +2 -2
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/FileResource.java
Index: FileResource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/FileResource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileResource.java 13 May 2002 12:17:40 -0000 1.5
+++ FileResource.java 7 Sep 2002 12:28:36 -0000 1.6
@@ -47,7 +47,7 @@
{
super( resource.getCanonicalPath() );
m_file = resource;
- m_previousModified = m_file.lastModified();
+ setPreviousModified( m_file.lastModified() );
}
/**
1.11 +44 -14
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/Resource.java
Index: Resource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/Resource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Resource.java 7 Sep 2002 12:14:01 -0000 1.10
+++ Resource.java 7 Sep 2002 12:28:36 -0000 1.11
@@ -27,11 +27,26 @@
public abstract class Resource
implements Modifiable
{
- private static final Set m_propertyListeners = Collections.synchronizedSet( new
HashSet() );
protected static final String MODIFIED = "last-modified";
+ private static final Set m_propertyListeners = Collections.synchronizedSet( new
HashSet() );
+
+ /**
+ * @deprecated Developers should use the setter/getters
+ * associated with field.
+ */
protected PropertyChangeSupport m_eventSupport = new PropertyChangeSupport(
this );
+
+ /**
+ * The resource key is the identifier of the resource.
+ * ie A FileResource would have the filename as the resourceKey.
+ */
private final String m_resourceKey;
+
+ /**
+ * @deprecated Developers should use the setter/getters
+ * associated with field.
+ */
protected long m_previousModified = 0L;
/**
@@ -39,9 +54,9 @@
* the specific resource monitor. For instance, a FileResource will be able
* to convert a string representation of a path to the proper File object.
*/
- public Resource( String location ) throws Exception
+ public Resource( final String resourceKey ) throws Exception
{
- m_resourceKey = location;
+ m_resourceKey = resourceKey;
}
/**
@@ -63,12 +78,12 @@
public void testModifiedAfter( long time )
{
final long lastModified = lastModified();
- if( lastModified > m_previousModified || lastModified > time )
+ if( lastModified > getPreviousModified() || lastModified > time )
{
- m_eventSupport.firePropertyChange( Resource.MODIFIED,
- new Long( m_previousModified ),
+ getEventSupport().firePropertyChange( Resource.MODIFIED,
+ new Long( getPreviousModified() ),
new Long( lastModified ) );
- m_previousModified = lastModified;
+ setPreviousModified( lastModified );
}
}
@@ -93,7 +108,7 @@
*/
public final void addPropertyChangeListener( PropertyChangeListener listener )
{
- m_eventSupport.addPropertyChangeListener( listener );
+ getEventSupport().addPropertyChangeListener( listener );
m_propertyListeners.add( listener );
}
@@ -103,7 +118,7 @@
*/
protected void addPropertyChangeListener( String property,
PropertyChangeListener listener )
{
- m_eventSupport.addPropertyChangeListener( property, listener );
+ getEventSupport().addPropertyChangeListener( property, listener );
m_propertyListeners.add( listener );
}
@@ -113,7 +128,7 @@
*/
public final void removePropertyChangeListener( PropertyChangeListener listener
)
{
- m_eventSupport.removePropertyChangeListener( listener );
+ getEventSupport().removePropertyChangeListener( listener );
m_propertyListeners.remove( listener );
}
@@ -123,7 +138,7 @@
*/
protected void removePropertyChangeListener( String property,
PropertyChangeListener listener )
{
- m_eventSupport.removePropertyChangeListener( property, listener );
+ getEventSupport().removePropertyChangeListener( property, listener );
m_propertyListeners.remove( listener );
}
@@ -132,7 +147,7 @@
*/
public final boolean hasListeners()
{
- return m_eventSupport.hasListeners( getResourceKey() );
+ return getEventSupport().hasListeners( getResourceKey() );
}
/**
@@ -155,6 +170,21 @@
*/
protected boolean hasListeners( String property )
{
- return m_eventSupport.hasListeners( property );
+ return getEventSupport().hasListeners( property );
+ }
+
+ protected final long getPreviousModified()
+ {
+ return m_previousModified;
+ }
+
+ protected final void setPreviousModified( final long previousModified )
+ {
+ m_previousModified = previousModified;
+ }
+
+ protected final PropertyChangeSupport getEventSupport()
+ {
+ return m_eventSupport;
}
}
1.8 +3 -3
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/SourceResource.java
Index: SourceResource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/SourceResource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SourceResource.java 7 Sep 2002 12:14:01 -0000 1.7
+++ SourceResource.java 7 Sep 2002 12:28:36 -0000 1.8
@@ -39,7 +39,7 @@
super( source.getSystemId() );
m_source = source;
- m_previousModified = System.currentTimeMillis();
+ setPreviousModified( System.currentTimeMillis() );
m_validity = source.getValidity();
}
@@ -58,7 +58,7 @@
SourceValidity newVal = m_source.getValidity();
if( newVal != null && m_validity.isValid( newVal ) == true )
{
- return m_previousModified;
+ return getPreviousModified();
}
else
{
1.6 +4 -4
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/StreamResource.java
Index: StreamResource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/StreamResource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StreamResource.java 13 May 2002 12:17:40 -0000 1.5
+++ StreamResource.java 7 Sep 2002 12:28:36 -0000 1.6
@@ -68,10 +68,10 @@
{
long lastModified = System.currentTimeMillis();
- m_eventSupport.firePropertyChange( Resource.MODIFIED,
- new Long( m_previousModified ),
+ getEventSupport().firePropertyChange( Resource.MODIFIED,
+ new Long( getPreviousModified() ),
new Long( lastModified ) );
- m_previousModified = lastModified;
+ setPreviousModified( lastModified );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
