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 2014/06/13 18:25:52 UTC
svn commit: r1602469 - in /pivot/trunk:
tests/src/org/apache/pivot/tests/issues/Pivot951.java
tutorials/www/table-panes.xml
Author: smartini
Date: Fri Jun 13 16:25:52 2014
New Revision: 1602469
URL: http://svn.apache.org/r1602469
Log:
update trunk with latest changes in 2.0.x
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot951.java
pivot/trunk/tutorials/www/table-panes.xml
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot951.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot951.java?rev=1602469&r1=1602468&r2=1602469&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot951.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot951.java Fri Jun 13 16:25:52 2014
@@ -1,4 +1,20 @@
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pivot.tests.issues;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
@@ -9,33 +25,34 @@ import org.apache.pivot.wtk.DesktopAppli
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Mouse.Button;
import org.apache.pivot.wtk.Window;
-
-public class Pivot951 implements Application {
+
+public class Pivot951 extends Application.Adapter {
private Window window = null;
@Override
public void startup(Display display, Map<String, String> properties) {
window = new Window();
-
+
Border brd = new Border();
brd.getComponentMouseButtonListeners().add(new ComponentMouseButtonListener.Adapter() {
- @Override
- public boolean mouseClick(Component component, Button button, int x, int y, int count) {
- if (count == 1)
- System.out.println("Click!");
- else
- System.out.println("Double Click!");
- return true;
- }
- });
-
+ @Override
+ public boolean mouseClick(Component component, Button button, int x, int y, int count) {
+ if (count == 1) {
+ System.out.println("Click!");
+ } else {
+ System.out.println("Double Click!");
+ }
+ return true;
+ }
+ });
+
window.setContent(brd);
window.setTitle("Pivot951: Cannot click twice");
window.setMaximized(true);
-
+
window.open(display);
}
-
+
@Override
public boolean shutdown(boolean optional) {
if (window != null) {
@@ -43,12 +60,9 @@ public class Pivot951 implements Applica
}
return false;
}
-
- @Override public void suspend() { }
- @Override public void resume() { }
-
+
public static void main(String[] args) {
DesktopApplicationContext.main(Pivot951.class, args);
}
-}
+}
Modified: pivot/trunk/tutorials/www/table-panes.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/www/table-panes.xml?rev=1602469&r1=1602468&r2=1602469&view=diff
==============================================================================
--- pivot/trunk/tutorials/www/table-panes.xml (original)
+++ pivot/trunk/tutorials/www/table-panes.xml Fri Jun 13 16:25:52 2014
@@ -37,25 +37,25 @@ limitations under the License.
<ul>
<li>
"-1" - default size, the column will be as wide as the widest component in that column,
- or a row would be as tall as the tallest component in that row.
+ or a row would be as tall as the tallest component in that row.
</li>
<li>
"a number > -1" - absolute size,
- that number will be the width in pixels for a column, or the height in pixels for a row.
+ that number will be the width in pixels for a column, or the height in pixels for a row.
</li>
<li>
"n*" - relative size,
- calculate the remaining space available in the column or in the row
- (using all relative columns/row cells),
- then add up the total of the relative values, divide the space by that number and reallocate
- the space for each column or row by multiplying the final value by each relative number.<br/>
- For example if the total space is 300 pixels and the column widths are "1*", "2*" and "3*":<br/>
- total relative value = 1 + 2 + 3 = 6<br/>
- base value = 300 / 6 = 50<br/>
- column widths = 1 * 50 = 50, 2 * 50 = 100, 3 * 50 = 150 (total 50 + 100 + 150 = 300)
+ calculate the remaining space available in the column or in the row
+ (using all relative columns/row cells),
+ then add up the total of the relative values, divide the space by that number and reallocate
+ the space for each column or row by multiplying the final value by each relative number.<br/>
+ For example if the total space is 300 pixels and the column widths are "1*", "2*" and "3*":<br/>
+ total relative value = 1 + 2 + 3 = 6<br/>
+ base value = 300 / 6 = 50<br/>
+ column widths = 1 * 50 = 50, 2 * 50 = 100, 3 * 50 = 150 (total 50 + 100 + 150 = 300)
</li>
</ul>
- <br/>
+ <br/>
<p>
Table panes support a number of styles that allow a caller to customize the arrangement