You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/08/06 01:57:44 UTC
cvs commit: jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout MultiColumnPortlet.java
weaver 2004/08/05 16:57:44
Modified: layout-portlets/src/java/org/apache/jetspeed/portlets/layout
MultiColumnPortlet.java
Log:
Made the flow for rearranging porlets smoother
Revision Changes Path
1.3 +14 -6 jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java
Index: MultiColumnPortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiColumnPortlet.java 5 Aug 2004 23:36:46 -0000 1.2
+++ MultiColumnPortlet.java 5 Aug 2004 23:57:44 -0000 1.3
@@ -292,18 +292,18 @@
int newRow = row + y;
int newColumn = column + x;
- doMoveFragmentTo(fToMove, newColumn, newRow, request, fragments);
+ doMoveFragmentTo(fToMove, newColumn, newRow, request, fragments, true);
}
- protected void doMoveFragmentTo( Fragment fToMove, int column, int row, RenderRequest request, List fragments )
+ protected void doMoveFragmentTo( Fragment fToMove, int column, int row, RenderRequest request, List fragments, boolean firstCall )
{
//Wrapping logic
if(column >= numColumns)
{
column = 0;
row+=1;
- doMoveFragmentTo(fToMove, column, row, request, fragments);
+ doMoveFragmentTo(fToMove, column, row, request, fragments, false);
return;
}
@@ -311,17 +311,18 @@
{
row-=1;
column=(numColumns-1);
- doMoveFragmentTo(fToMove, column, row, request, fragments);
+ doMoveFragmentTo(fToMove, column, row, request, fragments, false);
return;
}
else if(row < 0)
{
row = getLastRowInColumn(column, fragments, fToMove)+1;
- doMoveFragmentTo(fToMove, column, row, request, fragments);
+ doMoveFragmentTo(fToMove, column, row, request, fragments, false);
return;
}
else
{
+
int currentRow = Integer.parseInt(fToMove.getPropertyValue(layoutType, "row"));
int currentColumn = Integer.parseInt(fToMove.getPropertyValue(layoutType, "column"));
@@ -346,7 +347,14 @@
int aColumn = Integer.parseInt(aFragment.getPropertyValue(layoutType, "column"));
if (aColumn == column && aRow == row)
{
- doMoveFragmentTo(aFragment, currentColumn, currentRow, request, fragments );
+ if(currentColumn == column && currentRow < row && firstCall)
+ {
+ doMoveFragmentTo(aFragment, column, (row-1), request, fragments, false );
+ }
+ else
+ {
+ doMoveFragmentTo(aFragment, column, (row+1), request, fragments, false );
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org