isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1387965 - in /incubator/isis/trunk/framework/viewer/wicket: wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ wicket-ui/src/main/java/images/ wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/imagecache/ wic...
Date Thu, 20 Sep 2012 10:56:51 GMT
Author: danhaywood
Date: Thu Sep 20 10:56:49 2012
New Revision: 1387965

URL: http://svn.apache.org/viewvc?rev=1387965&view=rev
Log:
ISIS-232: image icons and similar

* move image files back to images/ directory
* search up hierarchy
* look for multiple file suffixes
* edits for scalar panels, removing 'id' (to fx datepicker, previous commit)

Added:
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Default.png
      - copied, changed from r1386818, incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Default.png
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Images.java
      - copied, changed from r1386818, incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java
Removed:
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/app/imagecache/ImageCacheAccessor.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Default.png
    incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java
Modified:
    incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/icontitle/EntityIconAndTitlePanel.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ImageResourceCache.java Thu Sep 20 10:56:49 2012
@@ -19,13 +19,12 @@
 
 package org.apache.isis.viewer.wicket.model.models;
 
-import org.apache.wicket.request.resource.PackageResource;
+import org.apache.wicket.request.resource.ResourceReference;
 
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 public interface ImageResourceCache {
 
-    public PackageResource findImage(ObjectSpecification objectSpec);
+    ResourceReference resourceReferenceFor(ObjectAdapter adapter);
 
-    public PackageResource findImageResource(String imageName);
 }

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Default.png (from r1386818, incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Default.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Default.png?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Default.png&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Default.png&r1=1386818&r2=1387965&rev=1387965&view=diff
==============================================================================
Binary files - no diff available.

Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Images.java (from r1386818, incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Images.java?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/images/Images.java&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/images/Images.java&r1=1386818&r2=1387965&rev=1387965&view=diff
==============================================================================
    (empty)

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTable.css Thu Sep 20 10:56:49 2012
@@ -32,7 +32,7 @@ table.collectionContentsAsAjaxTable tr {
 	}
 
 table.collectionContentsAsAjaxTable tr.even { background-color: #fff; }
-table.collectionContentsAsAjaxTable tr.odd { background-color: #fff; }
+table.collectionContentsAsAjaxTable tr.odd { background-color: #eee; }
 
 table.collectionContentsAsAjaxTable tr td { 
 	padding-left: 8px; 

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/icontitle/EntityIconAndTitlePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/icontitle/EntityIconAndTitlePanel.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/icontitle/EntityIconAndTitlePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/icontitle/EntityIconAndTitlePanel.java Thu Sep 20 10:56:49 2012
@@ -19,6 +19,10 @@
 
 package org.apache.isis.viewer.wicket.ui.components.entity.blocks.icontitle;
 
+import java.io.InputStream;
+
+import images.Images;
+
 import com.google.inject.Inject;
 
 import org.apache.wicket.Page;
@@ -27,6 +31,7 @@ import org.apache.wicket.markup.html.bas
 import org.apache.wicket.markup.html.image.Image;
 import org.apache.wicket.markup.html.link.AbstractLink;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.request.resource.PackageResourceReference;
 import org.apache.wicket.request.resource.ResourceReference;
 
@@ -53,9 +58,6 @@ public class EntityIconAndTitlePanel ext
     private static final String ID_ENTITY_TITLE = "entityTitle";
     private static final String ID_ENTITY_ICON = "entityImage";
 
-
-    private ImageResourceCache imageCache;
-
     private Label label;
     private Image image;
 
@@ -94,12 +96,15 @@ public class EntityIconAndTitlePanel ext
         
         label = new Label(ID_ENTITY_TITLE, determineTitle());
         link.add(label);
-        
-        final Class<?> correspondingClass = entityModel.getObject().getSpecification().getCorrespondingClass();
-        final String specName = correspondingClass.getSimpleName();
 
-        final ResourceReference imageResource = new PackageResourceReference(correspondingClass, specName + ".png");
-        image = new Image(ID_ENTITY_ICON, imageResource);
+        final ResourceReference imageResource = imageCache.resourceReferenceFor(adapter);
+        image = new Image(ID_ENTITY_ICON, imageResource) {
+            private static final long serialVersionUID = 1L;
+            @Override
+            protected boolean shouldAddAntiCacheParameter() {
+                return false;
+            }
+        };
         link.addOrReplace(image);
         
         final WebMarkupContainer entityLinkWrapper = new WebMarkupContainer(ID_ENTITY_LINK_WRAPPER);
@@ -132,13 +137,11 @@ public class EntityIconAndTitlePanel ext
     // Dependency Injection
     // ///////////////////////////////////////////////
 
+    @Inject
+    private ImageResourceCache imageCache;
+
     protected ImageResourceCache getImageCache() {
         return imageCache;
     }
 
-    @Inject
-    public void setImageCache(final ImageResourceCache imageCache) {
-        this.imageCache = imageCache;
-    }
-
 }

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/summary/EntitySummaryPanel.java Thu Sep 20 10:56:49 2012
@@ -59,7 +59,6 @@ public class EntitySummaryPanel extends 
 
     private final EntityActionLinkFactory linkFactory;
 
-    private ImageResourceCache imageCache;
 
     public EntitySummaryPanel(final String id, final EntityModel entityModel) {
         super(id, entityModel);
@@ -134,13 +133,12 @@ public class EntitySummaryPanel extends 
     // Dependency Injection
     // ///////////////////////////////////////////////
 
+    @Inject
+    private ImageResourceCache imageCache;
+
     protected ImageResourceCache getImageCache() {
         return imageCache;
     }
 
-    @Inject
-    public void setImageCache(final ImageResourceCache imageCache) {
-        this.imageCache = imageCache;
-    }
 
 }

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java Thu Sep 20 10:56:49 2012
@@ -88,7 +88,17 @@ public abstract class ScalarPanelTextFie
     protected void addSemantics() {
         super.addSemantics();
 
-        final DatePicker datePicker = new DatePicker();
+        final DatePicker datePicker = new DatePicker(){
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            protected String getAdditionalJavaScript()
+            {
+                return "${calendar}.cfg.setProperty(\"navigator\",true,false); ${calendar}.render();";
+            }
+        };
+        datePicker.setShowOnFieldClick(true);
+        datePicker.setAutoHide(true);
         getTextField().add(datePicker);
 
         addObjectAdapterValidator();

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="password" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="password" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+		      			<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+		      			<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+		      			<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+		      			<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+		      			<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+		      			<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java Thu Sep 20 10:56:49 2012
@@ -21,16 +21,10 @@ package org.apache.isis.viewer.wicket.ui
 
 import java.util.Date;
 
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
-import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
-import org.apache.wicket.model.Model;
 import org.joda.time.LocalDate;
 
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
 
 /**
  * Panel for rendering scalars of type {@link LocalDate}.

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="checkbox" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="checkbox" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-                                    <textarea name="scalarValue" id="scalarValue" wicket:id="scalarValue" ></textarea>
+                                    <textarea name="scalarValue" wicket:id="scalarValue" ></textarea>
 	      			</span>
 	      			<span wicket:id="feedback"></span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html Thu Sep 20 10:56:49 2012
@@ -29,7 +29,7 @@
 				<label for="scalarValue" wicket:id="scalarIfRegular">
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
-	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue" />
+	      				<input type="text" name="scalarValue" wicket:id="scalarValue" />
 		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java Thu Sep 20 10:56:49 2012
@@ -35,13 +35,9 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.Persistor;
 import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
-import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
 import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCacheAccessor;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
 import org.apache.isis.viewer.wicket.ui.util.Components;
 
 /**
@@ -122,16 +118,6 @@ public abstract class FormComponentPanel
         return cfra.getComponentFactoryRegistry();
     }
 
-    protected PageClassRegistry getPageClassRegistry() {
-        final PageClassRegistryAccessor pcra = (PageClassRegistryAccessor) getApplication();
-        return pcra.getPageClassRegistry();
-    }
-
-    protected ImageResourceCache getImageCache() {
-        final ImageCacheAccessor ica = (ImageCacheAccessor) getApplication();
-        return ica.getImageCache();
-    }
-
     /**
      * The underlying {@link AuthenticationSession Isis session} wrapped in the
      * {@link #getWebSession() Wicket session}.

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Thu Sep 20 10:56:49 2012
@@ -328,4 +328,21 @@ div.wicket-aa {
 	background-color: #00477F;
 	color: white;
 	
-}
\ No newline at end of file
+}
+
+tr.navigation div.navigatorLabel {
+	display: inline;
+}
+
+tr.navigation div.navigatorLabel > div {
+	display: inline;
+}
+
+tr.navigation div.navigator {
+	display: inline;
+}
+
+tr.navigation div.navigator > div {
+	display: inline;
+	float: right;
+}

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java Thu Sep 20 10:56:49 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.IHeaderContributor;
@@ -96,9 +98,13 @@ public abstract class FormAbstract<T> ex
     // Convenience
     // ///////////////////////////////////////////////////////////////////
 
+    @Inject
+    private ComponentFactoryRegistry componentFactoryRegistry;
+    
     @Override
     public ComponentFactoryRegistry getComponentFactoryRegistry() {
-        return ((ComponentFactoryRegistryAccessor) getApplication()).getComponentFactoryRegistry();
+        //return ((ComponentFactoryRegistryAccessor) getApplication()).getComponentFactoryRegistry();
+        return componentFactoryRegistry;
     }
 
     @Override

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java Thu Sep 20 10:56:49 2012
@@ -66,7 +66,6 @@ import org.apache.isis.viewer.wicket.mod
 import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
 import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
-import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCacheAccessor;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryList;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
@@ -74,7 +73,6 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
 import org.apache.isis.viewer.wicket.ui.pages.PageType;
-import org.apache.isis.viewer.wicket.viewer.imagecache.ImageCacheClassPath;
 import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
 import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServerPrototype;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
@@ -121,7 +119,7 @@ import org.apache.isis.viewer.wicket.vie
  * changed.)</li>
  * </ul>
  */
-public class IsisWicketApplication extends AuthenticatedWebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, ImageCacheAccessor, ApplicationCssRenderer, AuthenticationSessionProvider {
+public class IsisWicketApplication extends AuthenticatedWebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, ApplicationCssRenderer, AuthenticationSessionProvider {
 
     private static final long serialVersionUID = 1L;
 
@@ -142,7 +140,7 @@ public class IsisWicketApplication exten
      * {@link Inject}ed when {@link #init() initialized}.
      */
     @Inject
-    private ImageCacheClassPath imageCache;
+    private ImageResourceCache imageCache;
 
     /**
      * {@link Inject}ed when {@link #init() initialized}.
@@ -212,24 +210,24 @@ public class IsisWicketApplication exten
     }
 
     private DeploymentType determineDeploymentType() {
-        if (usesDevelopmentConfig()) {
-            return new WicketServerPrototype();
-        } else {
-            return new WicketServer();
-        }
+        return usesDevelopmentConfig() ? new WicketServerPrototype() : new WicketServer();
     }
 
     private IsisConfigurationBuilder createConfigBuilder() {
-        final ResourceStreamSource rssServletContext = new ResourceStreamSourceForWebInf(getServletContext());
+        return createConfigBuilder(getServletContext());
+    }
+
+    protected IsisConfigurationBuilder createConfigBuilder(final ServletContext servletContext) {
+        final ResourceStreamSource rssServletContext = new ResourceStreamSourceForWebInf(servletContext);
         final ResourceStreamSource rssTcl = ResourceStreamSourceContextLoaderClassPath.create();
         final ResourceStreamSource rssClasspath = new ResourceStreamSourceCurrentClassClassPath();
         final IsisConfigurationBuilderResourceStreams configurationBuilder = new IsisConfigurationBuilderResourceStreams(rssTcl, rssClasspath, rssServletContext);
-        primeConfigurationBuilder(configurationBuilder, getServletContext());
+        primeConfigurationBuilder(configurationBuilder, servletContext);
         return configurationBuilder;
     }
 
     @SuppressWarnings("unchecked")
-    private void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder, final ServletContext servletContext) {
+    private static void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder, final ServletContext servletContext) {
         final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers = (List<IsisConfigurationBuilderPrimer>) servletContext.getAttribute(WebAppConstants.CONFIGURATION_PRIMERS_KEY);
         if (isisConfigurationBuilderPrimers == null) {
             return;
@@ -254,13 +252,6 @@ public class IsisWicketApplication exten
     // Wicket Hooks
     // /////////////////////////////////////////////////
 
-//    @Override
-//    public IRequestCycleSettings getRequestCycleSettings() {
-//        final IRequestCycleSettings requestCycleSettings = super.getRequestCycleSettings();
-//        requestCycleSettings.setRenderStrategy(IRequestCycleSettings.REDIRECT_TO_RENDER);
-//        return requestCycleSettings;
-//    }
-    
     /**
      * Installs a {@link AuthenticatedWebSessionForIsis custom implementation}
      * of Wicket's own {@link AuthenticatedWebSession}, effectively associating
@@ -274,26 +265,9 @@ public class IsisWicketApplication exten
         return AuthenticatedWebSessionForIsis.class;
     }
 
-//    /**
-//     * Installs a {@link WebRequestCycleForIsis custom implementation} of
-//     * Wicket's own {@link RequestCycle}, hooking in to provide session and
-//     * transaction management across potentially multiple concurrent requests
-//     * for the same Wicket session.
-//     * 
-//     * <p>
-//     * In general, it shouldn't be necessary to override this method.
-//     */
-//    @Override
-//    public RequestCycle newRequestCycle(final Request request, final Response response) {
-//        return new WebRequestCycleForIsis(this, (WebRequest) request, response);
-//    }
-
     /**
      * Installs a {@link ConverterLocator} preconfigured with a number of
      * implementations to support Isis specific objects.
-     * 
-     * <p>
-     * In general, it shouldn't be necessary to override this method.
      */
     @Override
     protected IConverterLocator newConverterLocator() {
@@ -329,7 +303,6 @@ public class IsisWicketApplication exten
             return;
         }
         final IHeaderResponse response = container.getHeaderResponse();
-        //headerResponse.renderCSSReference(cssUrl);
         response.render(CssHeaderItem.forReference(new CssResourceReference(this.getClass(), cssUrl)));
     }
 
@@ -378,14 +351,6 @@ public class IsisWicketApplication exten
         return (Class<? extends WebPage>) getPageClassRegistry().getPageClass(PageType.SIGN_IN);
     }
 
-    // /////////////////////////////////////////////////
-    // Images
-    // /////////////////////////////////////////////////
-
-    @Override
-    public ImageResourceCache getImageCache() {
-        return imageCache;
-    }
 
     // /////////////////////////////////////////////////
     // Authentication Session

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketUnsecuredApplication.java Thu Sep 20 10:56:49 2012
@@ -19,14 +19,11 @@
 
 package org.apache.isis.viewer.wicket.viewer;
 
-import images.Images;
-
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 
-import org.apache.wicket.Application;
 import org.apache.wicket.ConverterLocator;
 import org.apache.wicket.IConverterLocator;
 import org.apache.wicket.Page;
@@ -39,8 +36,6 @@ import org.apache.wicket.markup.html.int
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.Request;
 import org.apache.wicket.request.Response;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
 import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
 
@@ -66,13 +61,11 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
 import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
-import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCacheAccessor;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
 import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
 import org.apache.isis.viewer.wicket.ui.pages.PageType;
-import org.apache.isis.viewer.wicket.viewer.imagecache.ImageCacheClassPath;
 import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServer;
 import org.apache.isis.viewer.wicket.viewer.integration.isis.WicketServerPrototype;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.AnonymousWebSessionForIsis;
@@ -80,7 +73,7 @@ import org.apache.isis.viewer.wicket.vie
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
 
-public class IsisWicketUnsecuredApplication extends WebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, ImageCacheAccessor, ApplicationCssRenderer, AuthenticationSessionProvider {
+public class IsisWicketUnsecuredApplication extends WebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, ApplicationCssRenderer, AuthenticationSessionProvider {
 
     private static final long serialVersionUID = 1L;
 
@@ -103,7 +96,7 @@ public class IsisWicketUnsecuredApplicat
      * {@link Inject}ed when {@link #init() initialized}.
      */
     @Inject
-    private ImageCacheClassPath imageCache;
+    private ImageResourceCache imageCache;
 
     /**
      * {@link Inject}ed when {@link #init() initialized}.
@@ -323,14 +316,6 @@ public class IsisWicketUnsecuredApplicat
         return getPageClassRegistry().getPageClass(PageType.HOME);
     }
 
-    // /////////////////////////////////////////////////
-    // Images
-    // /////////////////////////////////////////////////
-
-    @Override
-    public ImageResourceCache getImageCache() {
-        return imageCache;
-    }
 
     // /////////////////////////////////////////////////
     // Authentication Session

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java?rev=1387965&r1=1387964&r2=1387965&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java Thu Sep 20 10:56:49 2012
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.vi
 
 import images.Images;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -28,9 +30,12 @@ import java.util.Map;
 import com.google.common.collect.Maps;
 import com.google.inject.Singleton;
 
+import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.request.resource.PackageResource;
 import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
 
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
 
@@ -44,81 +49,73 @@ import org.apache.isis.viewer.wicket.mod
 @Singleton
 public class ImageCacheClassPath implements ImageResourceCache {
 
-    public final static List<String> IMAGE_SUFFICES = Arrays.asList("png", "gif", "jpeg", "jpg");
+    private static final List<String> IMAGE_SUFFICES = Arrays.asList("png", "gif", "jpeg", "jpg");
+    private static final String FALLBACK_IMAGE = "Default.png";
+    
+    private final Map<ObjectSpecification, ResourceReference> resourceReferenceBySpec = Maps.newHashMap();
 
-    private final Map<String, PackageResource> imagesByName = Maps.newHashMap();
 
     @Override
-    public PackageResource findImage(final ObjectSpecification noSpec) {
-        final String specFullName = noSpec.getFullIdentifier();
-        final PackageResource packageResource = findImageResource(specFullName);
-        if (packageResource != null) {
-            return packageResource;
-        } else {
-            return findAndCacheImage(noSpec);
-        }
+    public ResourceReference resourceReferenceFor(ObjectAdapter adapter) {
+        return resourceReferenceFor(adapter.getSpecification());
     }
 
-    @Override
-    public PackageResource findImageResource(final String imageName) {
-        final PackageResource packageResource = imagesByName.get(imageName);
-        if (packageResource != null) {
-            return packageResource;
-        } else {
-            return findAndCacheImage(imageName);
+    private ResourceReference resourceReferenceFor(final ObjectSpecification spec) {
+        ResourceReference resourceReference = resourceReferenceBySpec.get(spec);
+        if(resourceReference != null) {
+            return resourceReference;
         }
+        
+        resourceReference = lookupResourceReferenceFor(spec);
+        
+        resourceReferenceBySpec.put(spec, resourceReference);
+        return resourceReference;
     }
 
-    private PackageResource findAndCacheImage(final String imageName) {
-        final PackageResource packageResource = findImageSuffixed(imageName);
-        if (packageResource != null) {
-            imagesByName.put(imageName, packageResource);
+    private ResourceReference lookupResourceReferenceFor(final ObjectSpecification spec) {
+        final Class<?> correspondingClass = spec.getCorrespondingClass();
+        final String specName = correspondingClass.getSimpleName();
+        
+        final ResourceReference resourceReference = resourceReferenceFor(specName);
+        if(resourceReference != null) {
+            return resourceReference;
         }
-        return packageResource;
-    }
-
-    private PackageResource findImageSuffixed(final String imageName) {
-//        for (final String imageSuffix : IMAGE_SUFFICES) {
-//            final String path = buildImagePath(imageName, imageSuffix);
-//            if (PackageResource.exists(Images.class, path, null, null, null)) {
-//                return PackageResource.get(Images.class, path);
-//            }
-//        }
-        return null;
+        
+        // search up hierarchy
+        final ObjectSpecification superSpec = spec.superclass();
+        if(superSpec != null) {
+            return resourceReferenceFor(superSpec);
+        } 
+        
+        // fallback
+        return newPackageResourceReference(FALLBACK_IMAGE);
     }
 
-    private synchronized PackageResource findAndCacheImage(final ObjectSpecification noSpec) {
-        final PackageResource packageResource = findImageSearchUpHierarchy(noSpec);
-        imagesByName.put(noSpec.getFullIdentifier(), packageResource);
-        return packageResource;
-    }
-
-    private PackageResource findImageSearchUpHierarchy(final ObjectSpecification noSpec) {
-//        for (final String imageSuffix : IMAGE_SUFFICES) {
-//            final String fullName = noSpec.getFullIdentifier();
-//            final String path = buildImagePath(fullName, imageSuffix);
-//            if (PackageResource.exists(Images.class, path, null, null, null)) {
-//                return PackageResource.get(Images.class, path);
-//            }
-//        }
-//        for (final String imageSuffix : IMAGE_SUFFICES) {
-//            final String shortName = noSpec.getShortIdentifier();
-//            final String path = buildImagePath(shortName, imageSuffix);
-//            if (PackageResource.exists(Images.class, path, null, null, null)) {
-//                return PackageResource.get(Images.class, path);
-//            }
-//        }
-        final ObjectSpecification superSpec = noSpec.superclass();
-        if (superSpec != null) {
-            return findAndCacheImage(superSpec);
+    private static ResourceReference resourceReferenceFor(final String specName) {
+        for(String imageSuffix: IMAGE_SUFFICES) {
+            final String imageName = specName + "." + imageSuffix;
+
+            InputStream resourceAsStream = null;
+            resourceAsStream = Images.class.getResourceAsStream(imageName);
+            if(resourceAsStream == null) {
+                continue;
+            } else {
+                closeSafely(resourceAsStream);
+            }
+            return newPackageResourceReference(imageName);
         }
-        // fallback
-//        return PackageResource.get(Images.class, "Default.png");
         return null;
     }
 
-    private String buildImagePath(final String name, final String imageSuffix) {
-        return name + "." + imageSuffix;
+    private static PackageResourceReference newPackageResourceReference(final String imageFile) {
+        return new PackageResourceReference(Images.class, imageFile);
     }
 
+    private static void closeSafely(InputStream resourceAsStream) {
+        try {
+            resourceAsStream.close();
+        } catch (IOException e) {
+            // ignore
+        }
+    }
 }



Mime
View raw message