You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2009/11/20 10:27:37 UTC
svn commit: r882462 - in /incubator/pivot/trunk: demos/www/
tutorials/src/org/apache/pivot/tutorials/layout/
wtk/src/org/apache/pivot/wtk/skin/terra/
Author: smartini
Date: Fri Nov 20 09:27:36 2009
New Revision: 882462
URL: http://svn.apache.org/viewvc?rev=882462&view=rev
Log:
trim-whitespace
Modified:
incubator/pivot/trunk/demos/www/template.html
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/GridPanes.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
Modified: incubator/pivot/trunk/demos/www/template.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/template.html?rev=882462&r1=882461&r2=882462&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/template.html (original)
+++ incubator/pivot/trunk/demos/www/template.html Fri Nov 20 09:27:36 2009
@@ -10,151 +10,151 @@
<div id="wrapper">
- <div id="main">
-
- <div id="header">
-
- <div class="logo"><a href="index.html"><img src="images/logo.png" alt="Apache Pivot" title="Apache Pivot Homepage" /></a></div>
-
- <div class="tagline"><img src="images/tagline.png" alt="Rich Internet Application (RIA) in Java(tm)" /></div>
+ <div id="main">
+
+ <div id="header">
+
+ <div class="logo"><a href="index.html"><img src="images/logo.png" alt="Apache Pivot" title="Apache Pivot Homepage" /></a></div>
+
+ <div class="tagline"><img src="images/tagline.png" alt="Rich Internet Application (RIA) in Java(tm)" /></div>
<ul class="navi">
-
- <li><a href="#">Demos</a></li>
+
+ <li><a href="#">Demos</a></li>
<li><a href="#">Download</a></li>
<li><a href="#">Documentation</a></li>
<li><a href="#">Get Involved</a></li>
<li><a href="#">About</a></li>
-
+
</ul>
-
+
</div>
-
+
<div id="contentBase" class="group">
-
- <h1>demos</h1>
-
+
+ <h1>demos</h1>
+
<ul class="naviLeft">
- <li><a href="#">"Kitchen Sink"</a></li>
+ <li><a href="#">"Kitchen Sink"</a></li>
<li><a href="#">Stock Tracker</a></li>
<li><a href="#">iTunes Search</a></li>
<li><a href="#">Charting</a></li>
<li><a href="#">News Ticker / Slide Show</a></li>
<li><a href="#">JSON Viewer</a></li>
</ul>
-
+
<div class="content">
-
- <p>A collection of Pivot demos. All demos require Java 6 or greater.</p>
-
+
+ <p>A collection of Pivot demos. All demos require Java 6 or greater.</p>
+
<ul class="featuredDemos">
-
- <li>
- <h2>"Kitchen Sink"</h2>
+
+ <li>
+ <h2>"Kitchen Sink"</h2>
<div class="featuredDemosBox">
- <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_kitchen.jpg" alt="Kitchen Sink" /></a></p>
+ <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_kitchen.jpg" alt="Kitchen Sink" /></a></p>
<p class="featuredDemoDesc">Demonstrates a number of commonly used Pivot components.</p>
<p class="featuredDemoView"><a href="#">View</a></p>
</div>
</li>
-
+
<li>
- <h2>Stock Tracker</h2>
+ <h2>Stock Tracker</h2>
<div class="featuredDemosBox">
- <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_stock.jpg" alt="Stock Tracker" /></a></p>
+ <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_stock.jpg" alt="Stock Tracker" /></a></p>
<p class="featuredDemoDesc">A simple but practical "real world" application built using Pivot. Monitors stock quotes provided by Yahoo! Finance.</p>
<p class="featuredDemoView"><a href="#">View</a></p>
</div>
</li>
-
+
<li>
- <h2>iTunes Search</h2>
+ <h2>iTunes Search</h2>
<div class="featuredDemosBox">
- <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_itunes.jpg" alt="iTunes Search" /></a></p>
+ <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_itunes.jpg" alt="iTunes Search" /></a></p>
<p class="featuredDemoDesc">Simple application that allows a user to run search queries against the iTunes Music Store and presents the results in a table view.</p>
<p class="featuredDemoView"><a href="#">View</a></p>
</div>
</li>
-
+
<li>
- <h2>Charting</h2>
+ <h2>Charting</h2>
<div class="featuredDemosBox">
- <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_chart.jpg" alt="Charting" /></a></p>
+ <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_chart.jpg" alt="Charting" /></a></p>
<p class="featuredDemoDesc">Demonstrates charting in Pivot using the JFreeChart chart provider (hosted at http://ixnay.biz).</p>
<p class="featuredDemoView"><a href="#">View</a></p>
</div>
</li>
-
+
<li style="margin-right:0;">
- <h2>Decorator</h2>
+ <h2>Decorator</h2>
<div class="featuredDemosBox">
- <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_deco.jpg" alt="Decorator" /></a></p>
+ <p class="featuredDemoImg"><a href="#"><img src="images/demos_feat_deco.jpg" alt="Decorator" /></a></p>
<p class="featuredDemoDesc">Decorators allow developer attach additional presentation to components, such as drop shadows, reflections, image effects, etc.</p>
<p class="featuredDemoView"><a href="#">View</a></p>
</div>
</li>
-
+
</ul>
-
+
<h2>Other Demos</h2>
<ul class="otherDemos">
- <li>
- <strong>News Ticker/Slide Show</strong>
+ <li>
+ <strong>News Ticker/Slide Show</strong>
<em>Demonstrates Pivot used in a real-world context, used to show a news feed and a slide show of client logos (hosted at http://www.satelliteconsulting.com).</em>
<div class="btnView"><a href="#"><span>View</span></a></div>
</li>
- <li>
- <strong>JSON Viewer</strong>
+ <li>
+ <strong>JSON Viewer</strong>
<em>Allows users to visually browse a JSON structure using a TreeView component.</em>
<div class="btnView"><a href="#"><span>View</span></a></div>
</li>
- <li>
- <strong>Scripting</strong>
+ <li>
+ <strong>Scripting</strong>
<em>Simple example of a Pivot application written using JavaScript.</em>
<div class="btnView"><a href="#"><span>View</span></a></div>
</li>
</ul>
-
+
</div>
-
+
</div>
-
+
</div>
-
+
<div id="footer" class="group">
-
+
<div class="footerLogo">Copyright © 1999-2009, The Apache Software Foundation.</div>
-
+
<div class="footerLinks">
<ul class="footerMenuGr">
<li>
<strong>Demos</strong>
<ul>
- <li><a href="#">"Kitchen Sink"</a></li>
+ <li><a href="#">"Kitchen Sink"</a></li>
<li><a href="#">Charting</a></li>
<li><a href="#">File Drag & Drop</a></li>
<li><a href="#">More Demos</a></li>
</ul>
</li>
<li>
- <strong>Documentation</strong>
+ <strong>Documentation</strong>
<ul>
- <li><a href="#">FAQ</a></li>
+ <li><a href="#">FAQ</a></li>
<li><a href="#">Tutorial</a></li>
<li><a href="#">Javadoc (1.3)</a></li>
</ul>
</li>
<li>
- <strong>Get Involved</strong>
+ <strong>Get Involved</strong>
<ul>
- <li><a href="#">SVN Repositories</a></li>
+ <li><a href="#">SVN Repositories</a></li>
<li><a href="#">Mailing Lists</a></li>
<li><a href="#">Wiki</a></li>
</ul>
</li>
<li>
- <strong>About</strong>
+ <strong>About</strong>
<ul>
- <li><a href="#">Contact</a></li>
+ <li><a href="#">Contact</a></li>
<li><a href="#">Legal/License</a></li>
<li><a href="#">Sponsorship</a></li>
<li><a href="#">Thanks</a></li>
@@ -162,7 +162,7 @@
</li>
</ul>
</div>
-
+
</div>
</div>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/GridPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/GridPanes.java?rev=882462&r1=882461&r2=882462&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/GridPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/GridPanes.java Fri Nov 20 09:27:36 2009
@@ -84,7 +84,7 @@
panel.getStyles().put("backgroundColor", "#dddcd5");
row.add(panel);
}
-
+
int rowIndex = gridPane.getRowAt(contextMenuHandler.getY());
gridPane.getRows().insert(row, rowIndex);
}
@@ -112,7 +112,7 @@
});
}
});
-
+
namedActions.put("insertColumn", new Action() {
@Override
public void perform() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java?rev=882462&r1=882461&r2=882462&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListViewSkin.java Fri Nov 20 09:27:36 2009
@@ -71,7 +71,7 @@
private ArrayList<Integer> itemHeights;
private int fixedItemHeight;
-
+
private static final Checkbox CHECKBOX = new Checkbox();
static {
@@ -157,7 +157,7 @@
fixedItemHeight = Math.max(CHECKBOX.getHeight() + (checkboxPadding.top
+ checkboxPadding.bottom), fixedItemHeight);
}
-
+
preferredHeight = listData.getLength() * fixedItemHeight;
}
@@ -196,7 +196,7 @@
fixedItemHeight = Math.max(CHECKBOX.getHeight() + (checkboxPadding.top
+ checkboxPadding.bottom), fixedItemHeight);
}
-
+
baseline = itemRenderer.getBaseline(clientWidth, fixedItemHeight);
}
@@ -250,7 +250,7 @@
itemHeights.add(itemY);
itemY += itemHeight;
}
-
+
itemHeights.add(itemY);
} else {
itemRenderer.render(null, -1, listView, false, false, false, false);
@@ -387,7 +387,7 @@
} else {
index = (y / fixedItemHeight);
}
-
+
List<Object> listData = (List<Object>)listView.getListData();
if (index >= listData.getLength()) {
index = -1;
@@ -420,7 +420,7 @@
} else {
itemY = index * fixedItemHeight;
}
-
+
return itemY;
}
@@ -431,7 +431,7 @@
} else {
itemHeight = fixedItemHeight;
}
-
+
return itemHeight;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java?rev=882462&r1=882461&r2=882462&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTableViewSkin.java Fri Nov 20 09:27:36 2009
@@ -180,7 +180,7 @@
if (variableRowHeight) {
ArrayList<Integer> columnWidths = getColumnWidths(tableView, width);
-
+
for (int i = 0; i < n; i++) {
preferredHeight += getVariableRowHeight(i, columnWidths);
}
@@ -333,7 +333,7 @@
if (rowStart == -1) {
rowStart = tableData.getLength();
}
-
+
int lastRowBottomY = rowHeights.get(rowEnd+1) - 1;
rowEnd = getRowAt(Math.min(clipBounds.y + clipBounds.height - 1, lastRowBottomY));
} else {