You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/04/24 05:32:24 UTC
[1/2] directory-fortress-commander git commit: remove commented out
code
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master ac10baf62 -> 25ca1963b
remove commented out code
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/6f0c7c1b
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/6f0c7c1b
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/6f0c7c1b
Branch: refs/heads/master
Commit: 6f0c7c1b023b3443a029d37df58872599eefce71
Parents: ac10baf
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Apr 23 22:31:43 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Apr 23 22:31:43 2016 -0500
----------------------------------------------------------------------
.../directory/fortress/web/FourWaySplitter.java | 47 --------------------
1 file changed, 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/6f0c7c1b/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java b/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
index d2d037c..3db679b 100644
--- a/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
+++ b/src/main/java/org/apache/directory/fortress/web/FourWaySplitter.java
@@ -26,7 +26,6 @@ import org.apache.wicket.MarkupContainer;
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
- * Date: 5/21/13
*/
public class FourWaySplitter implements IBorderLayout
{
@@ -35,7 +34,6 @@ public class FourWaySplitter implements IBorderLayout
public FourWaySplitter()
{
- //init( "65", "26" );
init( "64", "36" );
}
@@ -48,72 +46,27 @@ public class FourWaySplitter implements IBorderLayout
{
this.listPercentage = listPercentage;
this.detailPercentage = detailPercentage;
-
}
public void addBorderLayout(MarkupContainer container)
{
- //container.add(new SplitterBehavior("#vertical").setOption("panes", this.getVerticalPanes()).setOption("orientation", "'vertical'"));
- //new SplitterBehavior("#vertical").setOption("panes", this.getVerticalPanes()).setOption("orientation", "'vertical'")
SplitterBehavior vertical = new SplitterBehavior("#vertical");
vertical.setOption("panes", this.getVerticalPanes()).setOption("orientation", "'vertical'");
- // This jumbles the splitter view:
- //vertical.setOption("cookie", "splitter1");
container.add(vertical);
- //container.add(new SplitterBehavior("#horizontal").setOption("panes", this.getHorizontalPanes()));
SplitterBehavior horizontal = new SplitterBehavior("#horizontal");
horizontal.setOption("panes", this.getHorizontalPanes());
container.add(horizontal);
- // does not work:
- //horizontal.setOption("cookie", "splitter2");
- /*
- SplitterBehavior verticalSplitter = new SplitterBehavior("#vertical");
- verticalSplitter.setOption("orientation", "'vertical'");
- verticalSplitter.setOption("min", "'400px'");
- verticalSplitter.setOption("max", "'800px'");
- verticalSplitter.setOption("height", "'100%'");
- verticalSplitter.setOption("size", "'60px'");
- verticalSplitter.setOption("collapsible", "'false'");
- container.add(verticalSplitter);
- */
-
- /*
- SplitterBehavior horizontalSplitter = new SplitterBehavior("#horizontal");
- horizontalSplitter.setOption("orientation", "'horizontal'");
- horizontalSplitter.setOption("min", "'400px'");
- horizontalSplitter.setOption("max", "'800px'");
- horizontalSplitter.setOption("height", "'100%'");
- horizontalSplitter.setOption("size", "'20%'");
- horizontalSplitter.setOption("collapsible", "'true'");
- container.add(horizontalSplitter);
- */
-
-
- //container.add(new SplitterBehavior("#vertical").setOption("panes", this.getVerticalPanes()).setOption("orientation", "'vertical'"));
- //container.add(new SplitterBehavior("#horizontal").setOption("panes", this.getHorizontalPanes()));
}
@Override
public String getVerticalPanes()
{
- //return "[ { resizable: false, size: '25%' }, { }, { collapsible: true, size: '25%' } ]";
- //return "[ { resizable: false, size: '15%' }, { resizable: true, size: '70%' }, { collapsible: true, size: '15%' } ]";
- //return "[ { collapsible: true, resizable: false, size: '50px', min: '50px', max: '50px', scrollable: false }, { resizable: true, size: '80%' }, { collapsible: true, size: '5%', min: '50px'} ]";
- //return "vertical";
- //return "[ { collapsible: true, resizable: false, size: '50px', min: '50px', max: '50px', scrollable: false }, { resizable: true, size: '80%' }, { collapsible: true, size: '5%', min: '50px'} ]";
- //return "[ { collapsible: true, size: '92%' }, { collapsible: true, size: '8%'} ]";
return "[ { collapsible: true, size: '80%' }, { collapsible: true, size: '5%'} ]";
}
@Override
public String getHorizontalPanes()
{
- //return "[ { size: '15%' }, { }, { size: '15%' } ]";
- //return "[ { collapsible: true, size: '78%' }, { size: '20%', max: '300px' } ]";
- //return "[ { collapsible: true, size: '78%' }, { collapsible: true, size: '20%', min: '200px', max: '300px' } ]";
- //return "[ { collapsible: true, size: '80%' }, { collapsible: true, size: '18%'} ]";
- //return "[ { collapsible: true, resizable: false, size: '85px', min: '85x', max: '85px'}, { collapsible: true, size: '65%' }, { collapsible: true, size: '26%'} ]";
return "[ { collapsible: true, resizable: false, size: '85px', min: '85x', max: '85px'}, { collapsible: true, size: '" + this.listPercentage + "%' }, { collapsible: true, size: '" + this.detailPercentage + "%'} ]";
- //return "[ { collapsible: true, resizable: false, size: '105px', min: '105x', max: '105px'}, { collapsible: true, size: '" + this.listPercentage + "%' }, { collapsible: true, size: '" + this.detailPercentage + "%'} ]";
}
}
[2/2] directory-fortress-commander git commit: remove commented out
code
Posted by sm...@apache.org.
remove commented out code
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/25ca1963
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/25ca1963
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/25ca1963
Branch: refs/heads/master
Commit: 25ca1963bce8b25a1271b199743a4efeff65c296
Parents: 6f0c7c1
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Apr 23 22:32:15 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Apr 23 22:32:15 2016 -0500
----------------------------------------------------------------------
.../directory/fortress/web/FiveWaySplitter.java | 39 --------------------
1 file changed, 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25ca1963/src/main/java/org/apache/directory/fortress/web/FiveWaySplitter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/FiveWaySplitter.java b/src/main/java/org/apache/directory/fortress/web/FiveWaySplitter.java
index fb8674e..d032382 100644
--- a/src/main/java/org/apache/directory/fortress/web/FiveWaySplitter.java
+++ b/src/main/java/org/apache/directory/fortress/web/FiveWaySplitter.java
@@ -27,63 +27,24 @@ import org.apache.wicket.MarkupContainer;
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
- * Date: 5/21/13
*/
public class FiveWaySplitter implements IBorderLayout
{
public void addBorderLayout(MarkupContainer container)
{
- System.out.println("addBorderLayout");
-
-
container.add(new SplitterBehavior("#vertical").setOption("panes", this.getVerticalPanes()).setOption("orientation", "'vertical'"));
container.add(new SplitterBehavior("#horizontal").setOption("panes", this.getHorizontalPanes()));
-
- /*
- SplitterBehavior verticalSplitter = new SplitterBehavior("#vertical");
- verticalSplitter.setOption("orientation", "'vertical'");
- verticalSplitter.setOption("min", "'400px'");
- verticalSplitter.setOption("max", "'800px'");
- verticalSplitter.setOption("height", "'100%'");
- verticalSplitter.setOption("size", "'60px'");
- verticalSplitter.setOption("collapsible", "'false'");
- container.add(verticalSplitter);
- */
-
- /*
- SplitterBehavior horizontalSplitter = new SplitterBehavior("#horizontal");
- horizontalSplitter.setOption("orientation", "'horizontal'");
- horizontalSplitter.setOption("min", "'400px'");
- horizontalSplitter.setOption("max", "'800px'");
- horizontalSplitter.setOption("height", "'100%'");
- horizontalSplitter.setOption("size", "'20%'");
- horizontalSplitter.setOption("collapsible", "'true'");
- container.add(horizontalSplitter);
- */
-
-
- //container.add(new SplitterBehavior("#vertical").setOption("panes", this.getVerticalPanes()).setOption("orientation", "'vertical'"));
- //container.add(new SplitterBehavior("#horizontal").setOption("panes", this.getHorizontalPanes()));
}
@Override
public String getVerticalPanes()
{
- System.out.println("getVerticalPanes");
- //return "[ { resizable: false, size: '25%' }, { }, { collapsible: true, size: '25%' } ]";
- //return "[ { resizable: false, size: '15%' }, { resizable: true, size: '70%' }, { collapsible: true, size: '15%' } ]";
return "[ { collapsible: true, resizable: false, size: '50px', min: '50px', max: '50px', scrollable: false }, { resizable: true, size: '80%' }, { collapsible: true, size: '5%', min: '50px'} ]";
- //return "vertical";
}
@Override
public String getHorizontalPanes()
{
- System.out.println("getHorizontalPanes");
- //return "[ { size: '15%' }, { }, { size: '15%' } ]";
- //return "[ { collapsible: true, size: '78%' }, { size: '20%', max: '300px' } ]";
- //return "[ { collapsible: true, size: '78%' }, { collapsible: true, size: '20%', min: '200px', max: '300px' } ]";
- //return "[ { collapsible: true, resizable: false, size: '85px', min: '85x', max: '85px'}, { collapsible: true, size: '73%' }, { collapsible: true, size: '18%'} ]";
return "[ { collapsible: true, resizable: false, size: '85px', min: '85x', max: '85px'}, { collapsible: true, size: '70%' }, { collapsible: true, size: '21%'} ]";
}
}