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 2012/05/03 17:31:43 UTC
svn commit: r1333506 - in /pivot/trunk:
core/src/org/apache/pivot/util/Console.java tutorials/www/menu-bars.xml
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
wtk/src/org/apache/pivot/wtk/Window.java
Author: smartini
Date: Thu May 3 15:31:43 2012
New Revision: 1333506
URL: http://svn.apache.org/viewvc?rev=1333506&view=rev
Log:
trim-whitespace
Modified:
pivot/trunk/core/src/org/apache/pivot/util/Console.java
pivot/trunk/tutorials/www/menu-bars.xml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
Modified: pivot/trunk/core/src/org/apache/pivot/util/Console.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/util/Console.java?rev=1333506&r1=1333505&r2=1333506&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/util/Console.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/util/Console.java Thu May 3 15:31:43 2012
@@ -25,25 +25,25 @@ public class Console {
}
public static final void log(String message) {
- logOutput(message);
+ logOutput(message);
}
public static final void log(Throwable t) {
- if (t != null) {
- t.printStackTrace();
+ if (t != null) {
+ t.printStackTrace();
}
}
public static final void logExceptionMessage(Throwable t) {
- logOutput(t.getMessage());
+ logOutput(t.getMessage());
}
public static final void logOutput(String message) {
- System.out.println(message != null ? message : "");
+ System.out.println(message != null ? message : "");
}
public static final void logError(String message) {
- System.err.println(message != null ? message : "");
+ System.err.println(message != null ? message : "");
}
}
Modified: pivot/trunk/tutorials/www/menu-bars.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/www/menu-bars.xml?rev=1333506&r1=1333505&r2=1333506&view=diff
==============================================================================
--- pivot/trunk/tutorials/www/menu-bars.xml (original)
+++ pivot/trunk/tutorials/www/menu-bars.xml Thu May 3 15:31:43 2012
@@ -41,7 +41,7 @@ limitations under the License.
</p>
<p>
- Note that for a keystroke to be processed (for example assigned to a Menu Item),
+ Note that for a keystroke to be processed (for example assigned to a Menu Item),
a component must have the focus to receive the key event and propagate it up the component hierarchy.
So, make sure that the window's content contains a focusable component, like a TextInput or PushButton.
</p>
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java?rev=1333506&r1=1333505&r2=1333506&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPaletteSkin.java Thu May 3 15:31:43 2012
@@ -365,7 +365,7 @@ public class TerraPaletteSkin extends Wi
boolean active = palette.getOwner().isActive();
boolean enabled = palette.isEnabled();
- Color currentTitleBarBackgroundColor = (active && enabled) ? titleBarBackgroundColor : inactiveTitleBarBackgroundColor;
+ Color currentTitleBarBackgroundColor = (active && enabled) ? titleBarBackgroundColor : inactiveTitleBarBackgroundColor;
Color currentTitleBarBorderColor = (active && enabled) ? titleBarBorderColor : inactiveTitleBarBorderColor;
Color titleBarBevelColor = TerraTheme.brighten(currentTitleBarBackgroundColor);
@@ -450,11 +450,11 @@ public class TerraPaletteSkin extends Wi
* @param font A {@link org.apache.pivot.wtk.skin.ComponentSkin#decodeFont(String) font specification}
*/
public final void setTitleFont(String font) {
- if (font == null) {
- throw new IllegalArgumentException("font is null.");
- }
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
- titleLabel.getStyles().put("font", decodeFont(font));
+ titleLabel.getStyles().put("font", decodeFont(font));
}
/**
@@ -462,26 +462,26 @@ public class TerraPaletteSkin extends Wi
* @param font A dictionary {@link Theme#deriveFont describing a font}
*/
public final void setTitleFont(Dictionary<String, ?> font) {
- if (font == null) {
- throw new IllegalArgumentException("font is null.");
- }
+ if (font == null) {
+ throw new IllegalArgumentException("font is null.");
+ }
- titleLabel.getStyles().put("font", Theme.deriveFont(font));
- }
+ titleLabel.getStyles().put("font", Theme.deriveFont(font));
+ }
public final float getTitleFontScale() {
- return titleFontScale;
+ return titleFontScale;
}
public final void setTitleFontScale(float scale) {
- this.titleFontScale = scale;
+ this.titleFontScale = scale;
- TerraTheme theme = (TerraTheme)Theme.getTheme();
- Font titleFont = theme.getFont();
- titleFont = titleFont.deriveFont(Font.BOLD, Math.round(titleFont.getSize2D() * scale));
- titleLabel.getStyles().put("font", titleFont);
- invalidateComponent();
- }
+ TerraTheme theme = (TerraTheme)Theme.getTheme();
+ Font titleFont = theme.getFont();
+ titleFont = titleFont.deriveFont(Font.BOLD, Math.round(titleFont.getSize2D() * scale));
+ titleLabel.getStyles().put("font", titleFont);
+ invalidateComponent();
+ }
@Override
public boolean mouseMove(Component component, int x, int y) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java?rev=1333506&r1=1333505&r2=1333506&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Window.java Thu May 3 15:31:43 2012
@@ -958,7 +958,7 @@ public class Window extends Container {
*/
public static void clearActive() {
if (activeWindow != null)
- setActiveWindow(activeWindow.owner);
+ setActiveWindow(activeWindow.owner);
}
/**