tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r544852 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/events/ main/java/org/apache/tapestry/internal/event/ main/java/org/apache/tapestry/internal/events/ main/java/org/apache/tapestry/internal/services/ ma...
Date Wed, 06 Jun 2007 14:36:12 GMT
Author: hlship
Date: Wed Jun  6 07:36:10 2007
New Revision: 544852

URL: http://svn.apache.org/viewvc?view=rev&rev=544852
Log:
Move two internal event interfaces under the internals package.

Added:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/
      - copied from r544521, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/events/
Removed:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/events/
Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/UpdateListener.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSource.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
 
 package org.apache.tapestry.internal.event;
 
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 
 /**
- * An object which manages a list of {@link org.apache.tapestry.events.InvalidationListener}s.
+ * An object which manages a list of
+ * {@link org.apache.tapestry.internal.events.InvalidationListener}s.
  * <p>
  * TODO: This interface need to move to the public side (as it is extended by other public
  * interfaces), or we need to come up with an alternate mechanism for propogating invalidation
data.
  */
-
 public interface InvalidationEventHub
 {
     void addInvalidationListener(InvalidationListener listener);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,35 +12,33 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.event;
-
+package org.apache.tapestry.internal.event;
+
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeList;
-
-import java.util.List;
-
-import org.apache.tapestry.events.InvalidationListener;
-
-/**
- * Base implementation class for classes (especially services) that need to manage a list
of
- * {@link org.apache.tapestry.events.InvalidationListener}s.
- * 
- * 
- */
-public class InvalidationEventHubImpl implements InvalidationEventHub
-{
-    private final List<InvalidationListener> _listeners = newThreadSafeList();
-
-    /** Notifies all {@link InvalidationListener listener}s. */
-    protected final void fireInvalidationEvent()
-    {
-        for (InvalidationListener listener : _listeners)
-        {
-            listener.objectWasInvalidated();
-        }
-    }
-
-    public final void addInvalidationListener(InvalidationListener listener)
-    {
-        _listeners.add(listener);
-    }
-}
+
+import java.util.List;
+
+import org.apache.tapestry.internal.events.InvalidationListener;
+
+/**
+ * Base implementation class for classes (especially services) that need to manage a list
of
+ * {@link org.apache.tapestry.internal.events.InvalidationListener}s.
+ */
+public class InvalidationEventHubImpl implements InvalidationEventHub
+{
+    private final List<InvalidationListener> _listeners = newThreadSafeList();
+
+    /** Notifies all {@link InvalidationListener listener}s. */
+    protected final void fireInvalidationEvent()
+    {
+        for (InvalidationListener listener : _listeners)
+        {
+            listener.objectWasInvalidated();
+        }
+    }
+
+    public final void addInvalidationListener(InvalidationListener listener)
+    {
+        _listeners.add(listener);
+    }
+}

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java?view=diff&rev=544852&r1=544521&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.events;
+package org.apache.tapestry.internal.events;
 
 /**
  * Interface for objects that may cache information that can be invalidated.
  * 
  * 
- * @see org.apache.tapestry.events.InvalidationEvent
+ * @see org.apache.tapestry.internal.events.InvalidationEvent
  */
 public interface InvalidationListener
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/UpdateListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/UpdateListener.java?view=diff&rev=544852&r1=544521&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/UpdateListener.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/UpdateListener.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,18 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.events;
-
-/**
- * Interface for objects which can periodically check for updates.
- * 
- * 
- */
-public interface UpdateListener
-{
-    /**
-     * Invoked to force the receiver to check for updates to whatever underlying resources
it makes
-     * use of.
-     */
-    void checkForUpdates();
-}
+package org.apache.tapestry.internal.events;
+
+/**
+ * Interface for objects which can periodically check for updates.
+ */
+public interface UpdateListener
+{
+    /**
+     * Invoked to force the receiver to check for updates to whatever underlying resources
it makes
+     * use of.
+     */
+    void checkForUpdates();
+}

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClasspathAssetFactory.java
Wed Jun  6 07:36:10 2007
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.apache.tapestry.Asset;
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.ioc.internal.util.ClasspathResource;
 import org.apache.tapestry.services.AssetFactory;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
Wed Jun  6 07:36:10 2007
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tapestry.events.InvalidationListener;
 import org.apache.tapestry.internal.InternalConstants;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.ioc.annotations.Inject;
 import org.apache.tapestry.ioc.annotations.Symbol;
 import org.apache.tapestry.services.ComponentClassResolver;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
Wed Jun  6 07:36:10 2007
@@ -24,7 +24,7 @@
 import javassist.NotFoundException;
 
 import org.apache.commons.logging.Log;
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.model.MutableComponentModelImpl;
 import org.apache.tapestry.ioc.LogSource;
 import org.apache.tapestry.ioc.Resource;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
  * component class name. This will involve transforming the component's class before it is
loaded.
  * <p>
  * In addition, a source acts as an event hub for
- * {@link org.apache.tapestry.events.InvalidationListener}s, so that any information derived
from
+ * {@link org.apache.tapestry.internal.events.InvalidationListener}s, so that any information
derived from
  * loaded classes can be discarded and rebuilt when classes change.
  * <p>
  * The strategy used is that when <em>any</em> class (in a controlled package)
changes, the entire

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@
 import javassist.Translator;
 
 import org.apache.commons.logging.Log;
-import org.apache.tapestry.events.UpdateListener;
 import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.internal.services.ClassFactoryClassPool;
 import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
Wed Jun  6 07:36:10 2007
@@ -16,8 +16,8 @@
 
 import java.util.Locale;
 
-import org.apache.tapestry.events.InvalidationListener;
-import org.apache.tapestry.events.UpdateListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
+import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.Messages;
 import org.apache.tapestry.ioc.Resource;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
Wed Jun  6 07:36:10 2007
@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.tapestry.events.UpdateListener;
 import org.apache.tapestry.internal.InternalConstants;
 import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.parser.ComponentTemplate;
 import org.apache.tapestry.internal.parser.TemplateToken;
 import org.apache.tapestry.internal.util.MultiKey;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java
Wed Jun  6 07:36:10 2007
@@ -16,7 +16,7 @@
 
 import java.util.Map;
 
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.ioc.services.PropertyAdapter;
 import org.apache.tapestry.ioc.util.StrategyRegistry;
 import org.apache.tapestry.services.DataTypeAnalyzer;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
Wed Jun  6 07:36:10 2007
@@ -28,9 +28,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.tapestry.Binding;
 import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.events.InvalidationListener;
 import org.apache.tapestry.internal.bindings.LiteralBinding;
 import org.apache.tapestry.internal.bindings.PropBindingFactory;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.util.IntegerRange;
 import org.apache.tapestry.ioc.Location;
 import org.apache.tapestry.ioc.MappedConfiguration;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSource.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSource.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSource.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 import java.util.Locale;
 
-import org.apache.tapestry.events.UpdateListener;
 import org.apache.tapestry.internal.event.InvalidationEventHub;
+import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.ioc.Messages;
 
 public interface MessagesSource extends InvalidationEventHub, UpdateListener

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java
Wed Jun  6 07:36:10 2007
@@ -15,8 +15,8 @@
 package org.apache.tapestry.internal.services;
 
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 
 import java.io.BufferedInputStream;
 import java.io.InputStream;
@@ -110,15 +110,13 @@
      */
     private Map<String, String> findBundleProperties(MessagesBundle bundle, Locale
locale)
     {
-        if (bundle == null)
-            return _emptyMap;
+        if (bundle == null) return _emptyMap;
 
         MultiKey key = new MultiKey(bundle.getId(), locale);
 
         Map<String, String> existing = _cookedProperties.get(key);
 
-        if (existing != null)
-            return existing;
+        if (existing != null) return existing;
 
         // What would be cool is if we could maintain a cache of bundle id + locale -->
         // Resource. That would optimize quite a bit of this; may need to use an alternative
to
@@ -167,8 +165,7 @@
      */
     private Map<String, String> extend(Map<String, String> base, Map<String,
String> rawProperties)
     {
-        if (rawProperties.isEmpty())
-            return base;
+        if (rawProperties.isEmpty()) return base;
 
         // Make a copy of the base Map
 
@@ -202,8 +199,7 @@
     {
         URL url = resource.toURL();
 
-        if (url == null)
-            return _emptyMap;
+        if (url == null) return _emptyMap;
 
         _tracker.add(url);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java
Wed Jun  6 07:36:10 2007
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.ioc.internal.util.CollectionFactory;
 import org.apache.tapestry.services.ComponentClassResolver;
 import org.apache.tapestry.services.MetaDataLocator;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
Wed Jun  6 07:36:10 2007
@@ -16,8 +16,8 @@
 
 import java.util.Locale;
 
-import org.apache.tapestry.events.InvalidationListener;
 import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.structure.Page;
 import org.apache.tapestry.services.PersistentFieldManager;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PagePoolImpl.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.structure.Page;
 import org.apache.tapestry.ioc.internal.util.CollectionFactory;
 import org.apache.tapestry.ioc.services.ThreadLocale;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PropertyConduitSourceImpl.java
Wed Jun  6 07:36:10 2007
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.util.MultiKey;
 import org.apache.tapestry.ioc.AnnotationProvider;
 import org.apache.tapestry.ioc.services.ClassFab;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ResourceCacheImpl.java
Wed Jun  6 07:36:10 2007
@@ -19,8 +19,8 @@
 import java.net.URL;
 import java.util.Map;
 
-import org.apache.tapestry.events.UpdateListener;
 import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.services.ResourceDigestGenerator;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TranslatorDefaultSourceImpl.java
Wed Jun  6 07:36:10 2007
@@ -17,7 +17,7 @@
 import java.util.Map;
 
 import org.apache.tapestry.Translator;
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.ioc.util.StrategyRegistry;
 import org.apache.tapestry.services.TranslatorDefaultSource;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
 
 package org.apache.tapestry.internal.services;
 
-import org.apache.tapestry.events.UpdateListener;
+import org.apache.tapestry.internal.events.UpdateListener;
 
 /**
- * Manages a set of {@link org.apache.tapestry.events.UpdateListener}s. Periodically (say,
every
+ * Manages a set of {@link org.apache.tapestry.internal.events.UpdateListener}s. Periodically
(say, every
  * request during development, or every minute or so during production), request processing
is
  * locked down so that only a single thread is active, and the active thread invokes
  * {@link #fireUpdateEvent()}. Various services that are dependent on external resource files
(such
  * as classes or template files) can check to see if any file they've used has changed. If
so, the
  * service can invalidate its internal cache, or notify other services (typically via
- * {@link org.apache.tapestry.events.InvalidationListener} that they should do the same.
+ * {@link org.apache.tapestry.internal.events.InvalidationListener} that they should do the
same.
  * 
  * 
  * @see org.apache.tapestry.internal.util.URLChangeTracker

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,35 +12,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
-
+package org.apache.tapestry.internal.services;
+
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeList;
-
-import java.util.List;
-
-import org.apache.tapestry.events.UpdateListener;
-
-/**
- * 
- */
-public class UpdateListenerHubImpl implements UpdateListenerHub
-{
-    private final List<UpdateListener> _listeners = newThreadSafeList();
-
-    public void addUpdateListener(UpdateListener listener)
-    {
-        _listeners.add(listener);
-
-    }
-
-    /**
-     * Notifies all {@link UpdateListener}s.
-     */
-    public void fireUpdateEvent()
-    {
-        for (UpdateListener listener : _listeners)
-        {
-            listener.checkForUpdates();
-        }
-    }
-}
+
+import java.util.List;
+
+import org.apache.tapestry.internal.events.UpdateListener;
+
+public class UpdateListenerHubImpl implements UpdateListenerHub
+{
+    private final List<UpdateListener> _listeners = newThreadSafeList();
+
+    public void addUpdateListener(UpdateListener listener)
+    {
+        _listeners.add(listener);
+
+    }
+
+    /**
+     * Notifies all {@link UpdateListener}s.
+     */
+    public void fireUpdateEvent()
+    {
+        for (UpdateListener listener : _listeners)
+        {
+            listener.checkForUpdates();
+        }
+    }
+}

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java
Wed Jun  6 07:36:10 2007
@@ -20,7 +20,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.tapestry.events.UpdateListener;
+import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.MessageFormatter;
 import org.apache.tapestry.ioc.Messages;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
Wed Jun  6 07:36:10 2007
@@ -32,12 +32,12 @@
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.ComponentResourcesCommon;
 import org.apache.tapestry.Link;
-import org.apache.tapestry.events.InvalidationListener;
 import org.apache.tapestry.internal.InternalComponentResources;
 import org.apache.tapestry.internal.InternalConstants;
 import org.apache.tapestry.internal.SingleKeySymbolProvider;
 import org.apache.tapestry.internal.SyntheticModuleDef;
 import org.apache.tapestry.internal.SyntheticSymbolSourceContributionDef;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.parser.ComponentTemplate;
 import org.apache.tapestry.internal.parser.TemplateToken;
 import org.apache.tapestry.internal.services.ComponentInstantiatorSource;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
Wed Jun  6 07:36:10 2007
@@ -21,8 +21,8 @@
 import java.util.Locale;
 import java.util.UUID;
 
-import org.apache.tapestry.events.InvalidationListener;
 import org.apache.tapestry.internal.InternalConstants;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.parser.ComponentTemplate;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.Resource;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
Wed Jun  6 07:36:10 2007
@@ -19,7 +19,7 @@
 import java.util.Locale;
 
 import org.apache.commons.logging.Log;
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.structure.Page;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.internal.services.ThreadLocaleImpl;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java
Wed Jun  6 07:36:10 2007
@@ -18,7 +18,7 @@
 import java.io.IOException;
 import java.net.URL;
 
-import org.apache.tapestry.events.InvalidationListener;
+import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.services.ResourceDigestGenerator;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java?view=diff&rev=544852&r1=544851&r2=544852
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/UpdateListenerHubImplTest.java
Wed Jun  6 07:36:10 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,33 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal.services;
-
-
-import org.apache.tapestry.events.UpdateListener;
+package org.apache.tapestry.internal.services;
+
+import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.ioc.test.TestBase;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class UpdateListenerHubImplTest extends TestBase
-{
-    @Test
-    public void add_listener_and_invoke() throws Exception
-    {
-        UpdateListener listener = newMock(UpdateListener.class);
-
-        UpdateListenerHub hub = new UpdateListenerHubImpl();
-
-        listener.checkForUpdates();
-
-        replay();
-
-        hub.addUpdateListener(listener);
-
-        hub.fireUpdateEvent();
-
-        verify();
-    }
-}
+import org.testng.annotations.Test;
+
+public class UpdateListenerHubImplTest extends TestBase
+{
+    @Test
+    public void add_listener_and_invoke() throws Exception
+    {
+        UpdateListener listener = newMock(UpdateListener.class);
+
+        UpdateListenerHub hub = new UpdateListenerHubImpl();
+
+        listener.checkForUpdates();
+
+        replay();
+
+        hub.addUpdateListener(listener);
+
+        hub.fireUpdateEvent();
+
+        verify();
+    }
+}



Mime
View raw message