isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1384215 [2/2] - in /incubator/isis/trunk/framework/viewer/wicket: wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/colum...
Date Thu, 13 Sep 2012 06:33:30 GMT
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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 		      			<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span style="padding-left: 100px" wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="checkbox" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<input type="checkbox" wicket:id="scalarIfCompact" />
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.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/primitive/BooleanPanel.java?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
Thu Sep 13 06:33:26 2012
@@ -61,7 +61,7 @@ public class BooleanPanel extends Scalar
         final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR,
checkBox);
         labelIfRegular.add(checkBox);
 
-        final Label scalarName = new Label(ID_SCALAR_NAME, getFormat().getLabelCaption(checkBox));
+        final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(checkBox));
         labelIfRegular.add(scalarName);
 
         addOrReplace(labelIfRegular);
@@ -72,7 +72,7 @@ public class BooleanPanel extends Scalar
 
     /**
      * Mandatory hook method to build the component to render the model when in
-     * {@link Format#COMPACT compact} format.
+     * {@link Rendering#COMPACT compact} format.
      */
     @Override
     protected Component addComponentForCompact() {

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.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/reference/ReferencePanel.java?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
Thu Sep 13 06:33:26 2012
@@ -60,14 +60,14 @@ public class ReferencePanel extends Scal
     protected void onBeforeRenderWhenEnabled() {
         super.onBeforeRenderWhenEnabled();
         entityLink.setEnabled(true);
-        entityLink.syncFindUsingAndEntityClearLinkVisibility();
+        entityLink.syncVisibility();
     }
 
     @Override
     protected void onBeforeRenderWhenViewMode() {
         super.onBeforeRenderWhenViewMode();
         entityLink.setEnabled(true);
-        entityLink.syncFindUsingAndEntityClearLinkVisibility();
+        entityLink.syncVisibility();
     }
 
     @Override
@@ -76,7 +76,7 @@ public class ReferencePanel extends Scal
         final EntityModel entityLinkModel = (EntityModel) entityLink.getModel();
         entityLinkModel.toViewMode();
         
-        entityLink.syncFindUsingAndEntityClearLinkVisibility();
+        entityLink.syncVisibility();
     }
 
     @Override
@@ -92,7 +92,7 @@ public class ReferencePanel extends Scal
         final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR,
entityLink);
         labelIfRegular.add(entityLink);
         
-        final Label scalarName = new Label(ID_SCALAR_NAME, getFormat().getLabelCaption(entityLink));
+        final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(entityLink));
         labelIfRegular.add(scalarName);
         
         addOrReplace(labelIfRegular);
@@ -145,7 +145,7 @@ public class ReferencePanel extends Scal
 
     /**
      * Mandatory hook method to build the component to render the model when in
-     * {@link Format#COMPACT compact} format.
+     * {@link Rendering#COMPACT compact} format.
      */
     @Override
     protected Component addComponentForCompact() {

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -31,9 +31,9 @@
 	      			<span class="scalarValue">
                                     <textarea name="scalarValue" id="scalarValue" wicket:id="scalarValue"
></textarea>
 	      			</span>
+	      			<span wicket:id="feedback"></span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.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/string/StringPanelFactory.java?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
Thu Sep 13 06:33:26 2012
@@ -35,9 +35,7 @@ public class StringPanelFactory extends 
 
     @Override
     public Component createComponent(final String id, final ScalarModel scalarModel) {
-        final Component component;
         final int numberOfLines = getNumberOfLines(scalarModel);
-        
         if (numberOfLines > 1) {
             return new MultiLineStringPanel(id, scalarModel, numberOfLines);
         } else {

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -30,10 +30,10 @@
 	      			<span wicket:id="scalarName" class="scalarName">[Label text]</span>
 	      			<span class="scalarValue">
 	      				<input type="text" name="scalarValue" id="scalarValue" wicket:id="scalarValue"
/>
+		      			<span wicket:id="feedback"></span>
 	      			</span>
 				</label>
 				<label wicket:id="scalarIfCompact"></label>
-      			<span wicket:id="feedback"></span>
 			</div>
 		</wicket:panel>
 	</body>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.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/widgets/entitylink/EntityLink.css?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.css
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.css
Thu Sep 13 06:33:26 2012
@@ -25,31 +25,18 @@ div.entityLink  {
 	height: 16px;
 }
 
-div.findUsingClearDetails {
-	height: 0px; // consume no height if empty
-}
-
-div.entityDetailsLinkDiv {
-	display: inline-table;
-	vertical-align: top;
-	padding-top: 1px;
-}
-
 .entityLink table.findUsing {
 	display: inline-table;
 	font-size: smaller;
 }
 
-a.entityClearLink, a.entityDetailsLink {
+a.entityDetailsLink {
 	text-align: left;
-	display:inline;
 	border: 1px  #00477F solid;
 	white-space:nowrap;
 	margin:0em;
 
 	margin-left: 5px;
-	padding-top: 1px;
-	padding-bottom: 1px;
 	font-weight: normal;
 	cursor:default;
 	font-size: smaller;
@@ -65,15 +52,20 @@ a.entityClearLink, a.entityDetailsLink {
 }
 
 a.entityClearLink {
-	margin-left: -10px;
-	padding-left: 2px;
-	padding-right: 2px;
+	display:inline-table;
+	margin-left: 0px;
+	padding-left: 0px;
+	padding-right: 0px;
+	font-size: smaller;
 }
 a.entityDetailsLink {
+	display:inline;
 	font-family: monospace;
 	margin-left: 20px;
 	padding-right: 3px;
 	padding-left: 3px;
+	padding-top: 1px;
+	padding-bottom: 1px;
 }
 
 a.entityDetailsLink:hover {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.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/widgets/entitylink/EntityLink.html?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.html
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.html
Thu Sep 13 06:33:26 2012
@@ -48,11 +48,9 @@
 			     			</tr>
 		     			</tbody>
 		  			</table>
-		  			<div class="entityDetailsLinkDiv">
 						<a href="#" wicket:id="entityClearLink" class="entityClearLink">
 							<span>clear</span>
 						</a>
-		  			</div>
 				</div>
 			    <div class="clear"/>
 	  			<div wicket:id="entityDetails" class="entityDetails">

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.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/entitylink/EntityLink.java?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
Thu Sep 13 06:33:26 2012
@@ -44,6 +44,7 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.model.models.ActionModel;
 import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint;
 import org.apache.isis.viewer.wicket.model.models.ScalarModel;
 import org.apache.isis.viewer.wicket.model.util.Mementos;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
@@ -185,21 +186,18 @@ public class EntityLink extends FormComp
      * seem to be anyway to install a listener. One option might be to move it
      * to {@link #onBeforeRender()} ?
      */
-    public void syncFindUsingAndEntityClearLinkVisibility() {
+    public void syncVisibility() {
         final boolean visibility = isEnableAllowed() && !getEntityModel().isViewMode();
         findUsing.setVisible(visibility);
         
 
-        // REVIEW: this is also hack, should be symmetrical with findUsing
         if(entityClearLink != null) {
             entityClearLink.setVisible(visibility);
         }
 
-        // TODO: this is also a hack.
         if(entityDetailsLink != null) {
-            entityDetailsLink.setVisible(!getEntityModel().isViewMode());
+            entityDetailsLink.setVisible(getEntityModel().getRenderingHint() == RenderingHint.REGULAR);
         }
-
     }
 
     /**
@@ -270,13 +268,16 @@ public class EntityLink extends FormComp
 
             // represent no object by a simple label displaying '(null)'
             syncEntityTitleNullWithInput(adapter);
+
+            // link
+            syncEntityClearLinksWithInput(adapter);
         }
+        
+        syncEntityDetailsLinksWithInput(adapter);
+        syncEntityDetailsWithInput(adapter);
 
-        // link
-        syncEntityClearAndDetailsLinksWithInput(adapter);
 
-        syncEntityDetailsWithInput(adapter);
-        syncFindUsingAndEntityClearLinkVisibility();
+        syncVisibility();
     }
 
     private ObjectAdapter getPendingElseCurrentAdapter() {
@@ -300,33 +301,37 @@ public class EntityLink extends FormComp
         }
     }
 
-    private void syncEntityClearAndDetailsLinksWithInput(final ObjectAdapter adapter) {
-        if (adapter != null) {
-            entityDetailsLink = new Link<String>(ID_ENTITY_DETAILS_LINK) {
-                private static final long serialVersionUID = 1L;
+    private void syncEntityDetailsLinksWithInput(final ObjectAdapter adapter) {
+        if (adapter == null) {
+            permanentlyHide(ID_ENTITY_DETAILS_LINK);
+            return;
+        } 
+        entityDetailsLink = new Link<String>(ID_ENTITY_DETAILS_LINK) {
+            private static final long serialVersionUID = 1L;
 
-                @Override
-                public void onClick() {
-                    getEntityModel().toggleDetails();
-                }
-            };
-            addOrReplace(entityDetailsLink);
-            entityDetailsLink.add(new Label(ID_ENTITY_DETAILS_LINK_LABEL, buildEntityDetailsModel()));
-
-            entityClearLink = new Link<String>(ID_ENTITY_CLEAR_LINK) {
-                private static final long serialVersionUID = 1L;
-
-                @Override
-                public void onClick() {
-                    onSelected((ObjectAdapterMemento)null);
-                }
-            };
-            addOrReplace(entityClearLink);
+            @Override
+            public void onClick() {
+                getEntityModel().toggleDetails();
+            }
+        };
+        addOrReplace(entityDetailsLink);
+        entityDetailsLink.add(new Label(ID_ENTITY_DETAILS_LINK_LABEL, buildEntityDetailsModel()));
+    }
 
-        } else {
-            permanentlyHide(ID_ENTITY_DETAILS_LINK);
+    private void syncEntityClearLinksWithInput(final ObjectAdapter adapter) {
+        if (adapter == null) {
             permanentlyHide(ID_ENTITY_CLEAR_LINK);
-        }
+            return;
+        } 
+        entityClearLink = new Link<String>(ID_ENTITY_CLEAR_LINK) {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public void onClick() {
+                onSelected((ObjectAdapterMemento)null);
+            }
+        };
+        addOrReplace(entityClearLink);
     }
 
     private Model<String> buildEntityDetailsModel() {
@@ -340,7 +345,6 @@ public class EntityLink extends FormComp
             
             final ComponentFactory componentFactory = getComponentFactoryRegistry().findComponentFactory(ComponentType.ENTITY_PROPERTIES,
entityModel);
             final Component entityPanel = componentFactory.createComponent(ID_ENTITY_DETAILS,
entityModel);
-            //final EntityCombinedPanel entityPanel = new EntityCombinedPanel(ID_ENTITY_DETAILS,
entityModel);
             
             addOrReplace(entityPanel);
         } else {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.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/valuechoices/ValueChoicesPanel.java?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesPanel.java
Thu Sep 13 06:33:26 2012
@@ -162,7 +162,7 @@ public class ValueChoicesPanel extends S
 
         final FormComponentLabel scalarNameAndValue = new FormComponentLabel(ID_SCALAR_IF_REGULAR,
valueField);
 
-        final Label scalarName = new Label(ID_SCALAR_NAME, getFormat().getLabelCaption(valueField));
+        final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(valueField));
         scalarNameAndValue.add(scalarName);
         scalarNameAndValue.add(valueField);
 

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=1384215&r1=1384214&r2=1384215&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 13 06:33:26 2012
@@ -51,8 +51,8 @@
     clear: both;
 }
 
-.feedbackPanel {
-	padding-left: 8em; //HACK
+.feedbackPanel li {
+	list-style: none;	
 }
 
 .leftSide {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java?rev=1384215&r1=1384214&r2=1384215&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java
(original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java
Thu Sep 13 06:33:26 2012
@@ -45,20 +45,20 @@ import org.apache.isis.viewer.wicket.ui.
 import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.entity.selector.EntitySelectorFactory;
 import org.apache.isis.viewer.wicket.ui.components.entity.tabbed.EntityTabbedPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisColorPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDatePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDateTimePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisMoneyPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisPasswordPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisPercentagePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisTimePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisTimeStampPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.JavaSqlDatePanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.JavaSqlTimePanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.JavaUtilDatePanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.JavaMathBigDecimalPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.JavaMathBigIntegerPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.jodatime.JodaLocalDatePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisColorPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisDatePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisDateTimePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisMoneyPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisPasswordPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisPercentagePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisTimePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.IsisTimeStampPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.BooleanPanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.BytePanelFactory;
 import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.CharacterPanelFactory;



Mime
View raw message