svn commit: r901023 - in /wicket/trunk: wicket-examples/src/main/java/org/apache/wicket/examples/images/ wicket/src/main/java/org/apache/wicket/ng/resource/

[knopp]

Author: knopp
Date: Wed Jan 20 01:03:45 2010
New Revision: 901023

URL: http://svn.apache.org/viewvc?rev=901023&view=rev
Log: (empty)

Modified:
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/SharedResourceReference.java

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java?rev=901023&r1=901022&r2=901023&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
 Wed Jan 20 01:03:45 2010
@@ -18,6 +18,7 @@
 
 import org.apache.wicket.Page;
 import org.apache.wicket.examples.WicketExampleApplication;
+import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource;
 
 
 /**
@@ -52,8 +53,7 @@
        {
                super.init();
 
-               // TODO (NG)
-// getSharedResources().add("cancelButton", new 
DefaultButtonImageResource("Cancel"));
+               getSharedResources().add("cancelButton", new 
DefaultButtonImageResource("Cancel"));
        }
 
 }

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java?rev=901023&r1=901022&r2=901023&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
 Wed Jan 20 01:03:45 2010
@@ -256,4 +256,15 @@
                        return Objects.hashCode(getLocale(), getStyle(), 
getVariation());
                }
        };
+
+       /**
+        * Can be used to disable registering certain resource references in
+        * {...@link ResourceReferenceRegistry}.
+        * 
+        * @return <code>true</code> if this reference can be registered, 
<code>false</code> otherwise.
+        */
+       public boolean canBeRegistered()
+       {
+               return true;
+       }
 }

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java?rev=901023&r1=901022&r2=901023&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
 Wed Jan 20 01:03:45 2010
@@ -105,12 +105,16 @@
        {
                Checks.argumentNotNull(reference, "reference");
 
-               Key key = new Key(reference.getScope().getName(), 
reference.getName(),
-                       reference.getLocale(), reference.getStyle(), 
reference.getVariation());
-
-               if (map.containsKey(key) == false)
+               if (reference.canBeRegistered())
                {
-                       map.put(key, reference);
+
+                       Key key = new Key(reference.getScope().getName(), 
reference.getName(),
+                               reference.getLocale(), reference.getStyle(), 
reference.getVariation());
+
+                       if (map.containsKey(key) == false)
+                       {
+                               map.put(key, reference);
+                       }
                }
        }
 

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/SharedResourceReference.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/SharedResourceReference.java?rev=901023&r1=901022&r2=901023&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/SharedResourceReference.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/SharedResourceReference.java
 Wed Jan 20 01:03:45 2010
@@ -62,10 +62,20 @@
                                }
                        };
                }
-               else
+               else if (ref != this)
                {
                        return ref.getResource();
                }
+               else
+               {
+                       throw new IllegalStateException(
+                               "SharedResourceReference can not be registered 
globally.");
+               }
        }
 
+       @Override
+       public boolean canBeRegistered()
+       {
+               return false;
+       }
 }