You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2012/09/28 17:30:19 UTC
svn commit: r1391503 - in /pivot/trunk: ./ core/src/org/apache/pivot/io/
tests/src/org/apache/pivot/tests/issues/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/content/
wtk/src/org/apache/pivo...
Author: rwhitcomb
Date: Fri Sep 28 15:30:18 2012
New Revision: 1391503
URL: http://svn.apache.org/viewvc?rev=1391503&view=rev
Log: (empty)
Removed:
pivot/trunk/core/src/org/apache/pivot/io/FileObjectList.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_cs.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_de.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_es.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_fr.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_it.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_pl.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_ru.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin_zh.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_cs.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_de.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_es.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_fr.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_it.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_pl.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_ru.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSkin_zh.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_vfs_browser_sheet_skin.bxml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_vfs_browser_skin.bxml
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowser.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheet.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/VFSBrowserSheetListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/VFSBrowserSkin.java
Modified:
pivot/trunk/ (props changed)
pivot/trunk/build.properties
pivot/trunk/build.xml
pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot721.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java
Propchange: pivot/trunk/
------------------------------------------------------------------------------
Reverse-merged /pivot/branches/2.0.x:r1391496
Modified: pivot/trunk/build.properties
URL: http://svn.apache.org/viewvc/pivot/trunk/build.properties?rev=1391503&r1=1391502&r2=1391503&view=diff
==============================================================================
--- pivot/trunk/build.properties (original)
+++ pivot/trunk/build.properties Fri Sep 28 15:30:18 2012
@@ -27,7 +27,7 @@ compiler.source=1.6
compiler.target=1.6
compiler.encoding=UTF-8
compiler.indexJars=true
-compiler.arg=-Xlint -bootclasspath c:/jdk1.6.0_16/jre/lib/rt.jar
+compiler.arg=-Xlint
# Test properties
test.verbose=false
Modified: pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1391503&r1=1391502&r2=1391503&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Fri Sep 28 15:30:18 2012
@@ -166,7 +166,6 @@ limitations under the License.
<path refid="classpath.general"/>
<dirset dir="${basedir}" includes="**/${folder.bin}"/>
<fileset dir="@{project}" includes="lib/**/*.jar"/>
- <fileset dir="${basedir}" includes="wtk/lib/*.jar"/>
<project-lib/>
</classpath>
</javac>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot721.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot721.java?rev=1391503&r1=1391502&r2=1391503&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot721.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot721.java Fri Sep 28 15:30:18 2012
@@ -32,7 +32,7 @@ public class Pivot721 extends Applicatio
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
BXMLSerializer bxmlSerializer = new BXMLSerializer();
- window = (Window) bxmlSerializer.readObject(Pivot721.class, "pivot_721.bxml");
+ window = (Window) bxmlSerializer.readObject(Pivot734.class, "pivot_721.bxml");
// force fill into button renderer, but only in some buttons ...
ButtonDataRenderer filledButtonDataRenderer = new ButtonDataRenderer();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java?rev=1391503&r1=1391502&r2=1391503&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme.java Fri Sep 28 15:30:18 2012
@@ -83,8 +83,6 @@ import org.apache.pivot.wtk.TextPane;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Tooltip;
import org.apache.pivot.wtk.TreeView;
-import org.apache.pivot.wtk.VFSBrowser;
-import org.apache.pivot.wtk.VFSBrowserSheet;
import org.apache.pivot.wtk.media.Image;
/**
@@ -157,8 +155,6 @@ public final class TerraTheme extends Th
componentSkinMap.put(TextInput.class, TerraTextInputSkin.class);
componentSkinMap.put(Tooltip.class, TerraTooltipSkin.class);
componentSkinMap.put(TreeView.class, TerraTreeViewSkin.class);
- componentSkinMap.put(VFSBrowser.class, TerraVFSBrowserSkin.class);
- componentSkinMap.put(VFSBrowserSheet.class, TerraVFSBrowserSheetSkin.class);
componentSkinMap.put(TerraCalendarSkin.DateButton.class, TerraCalendarSkin.DateButtonSkin.class);
componentSkinMap.put(TerraExpanderSkin.ShadeButton.class, TerraExpanderSkin.ShadeButtonSkin.class);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java?rev=1391503&r1=1391502&r2=1391503&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/content/ButtonDataRenderer.java Fri Sep 28 15:30:18 2012
@@ -38,6 +38,7 @@ public class ButtonDataRenderer extends
public ButtonDataRenderer() {
getStyles().put("horizontalAlignment", HorizontalAlignment.CENTER);
getStyles().put("verticalAlignment", VerticalAlignment.CENTER);
+ getStyles().put("fill", true);
add(imageView);
add(label);
@@ -80,11 +81,6 @@ public class ButtonDataRenderer extends
imageView.setImage(icon);
imageView.getStyles().put("opacity", button.isEnabled() ? 1.0f : 0.5f);
-
- if (getFillIcon()) {
- imageView.setPreferredWidth(button.getWidth());
- imageView.setPreferredHeight(button.getHeight());
- }
}
// Update the label
@@ -139,7 +135,6 @@ public class ButtonDataRenderer extends
public void setFillIcon(boolean fillIcon) {
imageView.getStyles().put("fill", fillIcon);
- getStyles().put("fill", fillIcon);
}
@Override