svn commit: r796968 - /myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java

[lo...@apache.org]

Author: lofwyr
Date: Thu Jul 23 07:17:11 2009
New Revision: 796968

URL: http://svn.apache.org/viewvc?rev=796968&view=rev
Log:
TOBAGO-606: Layout-Manager
 - add assertions

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java?rev=796968&r1=796967&r2=796968&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/layout/math/EquationManager.java Thu Jul 23 07:17:11 2009
@@ -41,29 +41,33 @@
     LOG.info(equations);
   }
 
-  public int[] divide(int index, int number, Measure spacing) {
+  public int[] partition(int index, int number, Measure spacing) {
 
     assert number > 0;
 
     int[] newIndices = equations.addVariables(number);
-    equations.addEqualsEquation(new PartitionEquation(
-        newIndices[0], number, index, spacing));
+    equations.addEqualsEquation(new PartitionEquation(newIndices[0], number, index, spacing));
     LOG.info(equations);
     return newIndices;
   }
 
-  public int addComponent(int index, int span, Measure spacing) {
+  public int combine(int index, int span, Measure spacing) {
 
     assert span > 0;
 
     int[] newIndices = equations.addVariables(1);
-    equations.addEqualsEquation(new CombinationEquation(
-        newIndices[0], index, span, spacing));
+    equations.addEqualsEquation(new CombinationEquation(newIndices[0], index, span, spacing));
     LOG.info(equations);
     return newIndices[0];
   }
 
-  public void setProportion(int index1, int index2, int factor1, int factor2) {
+  public void proportionate(int index1, int index2, int factor1, int factor2) {
+
+    assert index1 >= 0;
+    assert index2 >= 0;
+    assert factor1 > 0;
+    assert factor2 > 0;
+
     equations.addEqualsEquation(new ProportionEquation(index1, index2, factor1, factor2));
     LOG.info(equations);
   }