myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1666467 - in /myfaces/tobago/branches/tobago-3.0.x: ./ tobago-core/src/main/java/org/apache/myfaces/tobago/component/ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/ tobago-example/tobago-example-demo/src/main/java/...
Date Fri, 13 Mar 2015 14:37:03 GMT
Author: lofwyr
Date: Fri Mar 13 14:37:02 2015
New Revision: 1666467

URL: http://svn.apache.org/r1666467
Log:
Merged from trunk
TOBAGO-1448: Possibility to sort the tc:sheet before the first rendering. [from revision 1666464]

Modified:
    myfaces/tobago/branches/tobago-3.0.x/   (props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
  (contents, props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
  (contents, props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
  (contents, props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
  (contents, props changed)

Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 14:37:02 2015
@@ -1,3 +1,3 @@
 /myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
 /myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569,1666464

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=1666467&r1=1666466&r2=1666467&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
Fri Mar 13 14:37:02 2015
@@ -52,12 +52,16 @@ public class Sorter {
 
   private Comparator comparator;
 
+  /**
+   * @deprecated Please use {@link #perform(org.apache.myfaces.tobago.internal.component.AbstractUISheet)}
+   */
+  @Deprecated
   public void perform(final SortActionEvent sortEvent) {
-    if (LOG.isDebugEnabled()) {
-      LOG.debug("sorterId = {}", sortEvent.getComponent().getId());
-    }
-    final UIColumn column = sortEvent.getColumn();
     final AbstractUISheet data = (AbstractUISheet) sortEvent.getComponent();
+    perform(data);
+  }
+
+  public void perform(final AbstractUISheet data) {
 
     Object value = data.getValue();
     if (value instanceof DataModel) {
@@ -66,6 +70,22 @@ public class Sorter {
     final FacesContext facesContext = FacesContext.getCurrentInstance();
     final SheetState sheetState = data.getSheetState(facesContext);
 
+    final String sortedColumnId = sheetState.getSortedColumnId();
+    if (LOG.isDebugEnabled()) {
+      LOG.debug("sorterId = '{}'", sortedColumnId);
+    }
+
+    if (sortedColumnId == null) {
+      // not to be sorted
+      return;
+    }
+
+    final UIColumn column = (UIColumn) data.findComponent(sortedColumnId);
+    if (column == null) {
+      LOG.warn("No column to sort found, sorterId = '{}'", sortedColumnId);
+      return;
+    }
+
     final Comparator actualComparator;
 
     if (value instanceof List || value instanceof Object[]) {

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java?rev=1666467&r1=1666466&r2=1666467&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheet.java
Fri Mar 13 14:37:02 2015
@@ -111,6 +111,19 @@ public abstract class AbstractUISheet ex
         setFirst(first);
       }
     }
+
+    final MethodExpression expression = getSortActionListenerExpression();
+    if (expression != null) {
+      try {
+        FacesEvent facesEvent = new SortActionEvent(this, null);
+        expression.invoke(facesContext.getELContext(), new Object[]{facesEvent});
+      } catch (Exception e) {
+        LOG.warn("Initial sorting not possible!", e);
+      }
+    } else {
+      new Sorter().perform(this);
+    }
+
     super.encodeBegin(facesContext);
   }
 
@@ -441,13 +454,11 @@ public abstract class AbstractUISheet ex
         performPaging((PageActionEvent) facesEvent);
       }
     } else if (facesEvent instanceof SortActionEvent) {
+      getSheetState(getFacesContext()).updateSortState((SortActionEvent) facesEvent);
       final MethodExpression expression = getSortActionListenerExpression();
-      if (expression!= null) {
-        // TODO should be first invokeMethodBinding and the update state
-        getSheetState(getFacesContext()).updateSortState((SortActionEvent) facesEvent);
+      if (expression != null) {
         expression.invoke(getFacesContext().getELContext(), new Object[]{facesEvent});
       } else {
-        getSheetState(getFacesContext()).updateSortState((SortActionEvent) facesEvent);
         new Sorter().perform((SortActionEvent) facesEvent);
       }
     }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=1666467&r1=1666466&r2=1666467&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
Fri Mar 13 14:37:02 2015
@@ -19,8 +19,10 @@
 
 package org.apache.myfaces.tobago.example.demo;
 
+import org.apache.myfaces.tobago.component.UISheet;
 import org.apache.myfaces.tobago.component.UIToolBar;
 import org.apache.myfaces.tobago.context.ResourceManagerUtils;
+import org.apache.myfaces.tobago.event.SortActionEvent;
 import org.apache.myfaces.tobago.event.TabChangeListener;
 import org.apache.myfaces.tobago.example.data.CategoryTree;
 import org.apache.myfaces.tobago.example.data.Solar;
@@ -45,6 +47,8 @@ import javax.servlet.http.HttpSession;
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
@@ -494,6 +498,78 @@ public class TobagoDemoController implem
 
   public void setSheetState(final SheetState sheetState) {
     this.sheetState = sheetState;
+    if (this.sheetState.getSortedColumnId() == null) {
+      this.sheetState.setSortedColumnId("distance");
+//      sheetSorter(this.sheetState, solarList);
+    }
+  }
+
+  public void sheetSorter(final ActionEvent event) {
+    if (event instanceof SortActionEvent) {
+      final SortActionEvent sortEvent = (SortActionEvent) event;
+      final UISheet sheet = (UISheet) sortEvent.getComponent();
+      final SheetState sheetState = sheet.getSheetState(FacesContext.getCurrentInstance());
+      final List<SolarObject> list = (List<SolarObject>) sheet.getValue();
+      sheetSorter(sheetState, list);
+    }
+  }
+
+  private void sheetSorter(final SheetState sheetState, final List<SolarObject> list)
{
+    final SolarObject sun = list.remove(0);
+    final String columnId = sheetState.getSortedColumnId();
+
+    Comparator<SolarObject> comparator = null;
+
+    if ("name".equals(columnId)) {
+      comparator = new Comparator<SolarObject>() {
+        public int compare(final SolarObject o1, final SolarObject o2) {
+          return o1.getName().compareToIgnoreCase(o2.getName());
+        }
+      };
+    } else if ("orbit".equals(columnId)) {
+      comparator = new Comparator<SolarObject>() {
+        public int compare(final SolarObject o1, final SolarObject o2) {
+          return o1.getOrbit().compareToIgnoreCase(o2.getOrbit());
+        }
+      };
+    } else if ("population".equals(columnId)) {
+      comparator = new Comparator<SolarObject>() {
+        public int compare(final SolarObject o1, final SolarObject o2) {
+          Integer i1 = -1;
+          try {
+            i1 = new Integer(o1.getPopulation().replaceAll("\\D", "").trim());
+          } catch (final NumberFormatException e) {
+            // ignore
+          }
+          Integer i2 = -1;
+          try {
+            i2 = new Integer(o2.getPopulation().replaceAll("\\D", "").trim());
+          } catch (final NumberFormatException e) {
+            // ignore
+          }
+          return i1.compareTo(i2);
+        }
+      };
+    } else if ("distance".equals(columnId)) {
+      comparator = new Comparator<SolarObject>() {
+        public int compare(final SolarObject o1, final SolarObject o2) {
+          return o1.getDistance().compareTo(o2.getDistance());
+        }
+      };
+    } else if ("period".equals(columnId)) {
+      comparator = new Comparator<SolarObject>() {
+        public int compare(final SolarObject o1, final SolarObject o2) {
+          return o1.getPeriod().compareTo(o2.getPeriod());
+        }
+      };
+    }
+
+    Collections.sort(list, comparator);
+    if (!sheetState.isAscending()) {
+      Collections.reverse(list);
+    }
+
+    list.add(0, sun);
   }
 
   public SheetState getSheetTreeState() {

Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 14:37:02 2015
@@ -1,3 +1,3 @@
 /myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java:1356585,1357124
 /myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java:1226794-1341423
-/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288,1641775
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288,1641775,1666464

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=1666467&r1=1666466&r2=1666467&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
Fri Mar 13 14:37:02 2015
@@ -24,13 +24,10 @@ import org.apache.deltaspike.core.api.sc
 import org.apache.myfaces.tobago.component.UISheet;
 import org.apache.myfaces.tobago.component.UIToolBar;
 import org.apache.myfaces.tobago.context.ResourceManagerUtils;
-import org.apache.myfaces.tobago.event.SortActionEvent;
 import org.apache.myfaces.tobago.example.data.LocaleList;
 import org.apache.myfaces.tobago.example.data.Salutation;
-import org.apache.myfaces.tobago.example.data.SolarObject;
 import org.apache.myfaces.tobago.model.SelectItem;
 import org.apache.myfaces.tobago.model.Selectable;
-import org.apache.myfaces.tobago.model.SheetState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,8 +40,6 @@ import javax.faces.validator.ValidatorEx
 import javax.inject.Named;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -189,71 +184,6 @@ public class OverviewController implemen
     }
   }
 
-  public void sheetSorter(final ActionEvent event) {
-    if (event instanceof SortActionEvent) {
-      final SortActionEvent sortEvent = (SortActionEvent) event;
-      final UISheet sheet = (UISheet) sortEvent.getComponent();
-      final SheetState sheetState
-          = sheet.getSheetState(FacesContext.getCurrentInstance());
-      final String columnId = sheetState.getSortedColumnId();
-      final List<SolarObject> list = (List<SolarObject>) sheet.getValue();
-      final SolarObject sun = list.remove(0);
-
-      Comparator<SolarObject> comparator = null;
-
-      if ("name".equals(columnId)) {
-        comparator = new Comparator<SolarObject>() {
-          public int compare(final SolarObject o1, final SolarObject o2) {
-            return o1.getName().compareToIgnoreCase(o2.getName());
-          }
-        };
-      } else if ("orbit".equals(columnId)) {
-        comparator = new Comparator<SolarObject>() {
-          public int compare(final SolarObject o1, final SolarObject o2) {
-            return o1.getOrbit().compareToIgnoreCase(o2.getOrbit());
-          }
-        };
-      } else if ("population".equals(columnId)) {
-        comparator = new Comparator<SolarObject>() {
-          public int compare(final SolarObject o1, final SolarObject o2) {
-            Integer i1 = -1;
-            try {
-              i1 = new Integer(o1.getPopulation().replaceAll("\\D", "").trim());
-            } catch (final NumberFormatException e) {
-              // ignore
-            }
-            Integer i2 = -1;
-            try {
-              i2 = new Integer(o2.getPopulation().replaceAll("\\D", "").trim());
-            } catch (final NumberFormatException e) {
-              // ignore
-            }
-            return i1.compareTo(i2);
-          }
-        };
-      } else if ("distance".equals(columnId)) {
-        comparator = new Comparator<SolarObject>() {
-          public int compare(final SolarObject o1, final SolarObject o2) {
-            return o1.getDistance().compareTo(o2.getDistance());
-          }
-        };
-      } else if ("period".equals(columnId)) {
-        comparator = new Comparator<SolarObject>() {
-          public int compare(final SolarObject o1, final SolarObject o2) {
-            return o1.getPeriod().compareTo(o2.getPeriod());
-          }
-        };
-      }
-
-      Collections.sort(list, comparator);
-      if (!sheetState.isAscending()) {
-        Collections.reverse(list);
-      }
-
-      list.add(0, sun);
-    }
-  }
-
   public String ping() {
     LOG.debug("ping invoked");
     return null;

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml?rev=1666467&r1=1666466&r2=1666467&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
Fri Mar 13 14:37:02 2015
@@ -144,7 +144,7 @@
               rows="#{overviewController.sheetConfig.sheetRows}"
               directLinkCount="#{overviewController.sheetConfig.sheetDirectLinkCount}"
               stateChangeListener="#{demo.stateChangeListener}"
-              sortActionListener="#{overviewController.sheetSorter}"
+              sortActionListener="#{demo.sheetSorter}"
               selectable="#{overviewController.sheetConfig.selectable}"
               showDirectLinksArrows="#{overviewController.sheetConfig.showDirectLinksArrows}"
               showPageRangeArrows="#{overviewController.sheetConfig.showPageRangeArrows}"
@@ -176,6 +176,9 @@
               <f:param value="#{luminary}" name="luminary"/>
             </tc:command>
           </f:facet>
+          <f:facet name="layout">
+            <tc:gridLayout rows="20px"/>
+          </f:facet>
           <tc:out value="#{luminary.orbit}" id="t_orbit"/>
         </tc:panel>
       </tc:column>

Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 14:37:02 2015
@@ -1 +1 @@
-/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml:1621332,1622508,1659031
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml:1621332,1622508,1659031,1666464

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1666467&r1=1666466&r2=1666467&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Fri Mar 13 14:37:02 2015
@@ -140,6 +140,7 @@
     &lt;li style="line-height: 130%;"&gt;The column width can be resized by simply
     drag and drop the column border.
     &lt;/ul&gt;
+    This example shows an application specific sorter, which sorts the sun to the top every
time.
 </entry>
 <entry key="sheet_resetLabel">Reset</entry>
 <entry key="sheet_resetTip">Reset the modified widths of the columns in the sheet.</entry>

Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 14:37:02 2015
@@ -1,3 +1,3 @@
 /myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1356585,1357124
 /myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1226794-1341423
-/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288,1666464

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml?rev=1666467&r1=1666466&r2=1666467&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
Fri Mar 13 14:37:02 2015
@@ -94,7 +94,16 @@
   <entry key="basic_text_action">Steuerelemente für die Navigation und zum Ausführen
von Aktionen.</entry>
 
 <!--  sheet -->
-  <entry key="sheet_text">Das Sheet-Control bietet eine einfache Möglichkeit tabellarische
Daten darzustellen. Die wichtigsten Eigenschaften sind: &lt;ul style="margin-top: 2px;"&gt;
&lt;li style="line-height: 130%;"&gt;Paging: Es wird nur ein Teil der Gesamtliste
angezeigt.   Über die Pfeilknöpfe kann in der Liste navigiert werden.&lt;/li&gt;
&lt;li style="line-height: 130%;"&gt;Sortierung: Durch Drücken auf die Spaltenüberschrift
  kann die entsprechende Spalte sortiert werden.&lt;/li&gt; &lt;li style="line-height:
130%;"&gt;Inline-Editing: Es können bei Bedarf Werte   direkt in die Tabelle eingegeben
werden.&lt;/li&gt; &lt;li style="line-height: 130%;"&gt;Die Spaltenbreite
kann direkt mit der Maus   manipuliert werden.&lt;/li&gt; &lt;/ul&gt;</entry>
+  <entry key="sheet_text">Das Sheet-Control bietet eine einfache Möglichkeit tabellarische
Daten darzustellen.
+    Die wichtigsten Eigenschaften sind: &lt;ul style="margin-top: 2px;"&gt; &lt;li
style="line-height: 130%;"&gt;Paging:
+    Es wird nur ein Teil der Gesamtliste angezeigt.   Über die Pfeilknöpfe kann in
der Liste navigiert werden.
+    &lt;/li&gt; &lt;li style="line-height: 130%;"&gt;Sortierung: Durch Drücken
auf die Spaltenüberschrift
+    kann die entsprechende Spalte sortiert werden.&lt;/li&gt; &lt;li style="line-height:
130%;"&gt;Inline-Editing:
+    Es können bei Bedarf Werte   direkt in die Tabelle eingegeben werden.
+    &lt;/li&gt; &lt;li style="line-height: 130%;"&gt;Die Spaltenbreite kann
direkt mit der Maus
+    manipuliert werden.&lt;/li&gt; &lt;/ul&gt;
+    In diesem Beispiel ist in applikationsspezifischer Sorter hinterlegt, der die Sonne immer
oben erscheinen lässt.
+  </entry>
   <entry key="sheet_resetTip">Hier klicken um den Orginalzustand der Spaltenbreiten
wiederherzustellen.</entry>
   <entry key="sheet_configTip">Hier klicken zum Einstellen der Tabellenkonfiguration.</entry>
   <entry key="sheet_configTitle">Tabelle konfigurieren</entry>

Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 14:37:02 2015
@@ -1,3 +1,3 @@
 /myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml:1356585,1357124
 /myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml:1226794-1341423
-/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1590288,1666464



Mime
View raw message