You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/08/14 15:26:07 UTC
svn commit: r804218 - in /incubator/pivot/trunk/wtk:
src/org/apache/pivot/wtk/skin/ src/org/apache/pivot/wtk/skin/terra/
test/org/apache/pivot/wtk/test/
Author: gbrown
Date: Fri Aug 14 13:26:06 2009
New Revision: 804218
URL: http://svn.apache.org/viewvc?rev=804218&view=rev
Log:
Move responsibility for popup placement into Terra list, menu, and calendar button skins (from abstract base classes); fix layout bug in TerraPanoramaSkin (should always behave as if "fill to capacity" is true); rename FileBrowserTest to FileBrowserSheetTest.
Added:
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java
- copied, changed from r804030, incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/file_browser_sheet_test.wtkx
- copied unchanged from r804030, incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/file_browser_test.wtkx
Removed:
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/file_browser_test.wtkx
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java?rev=804218&r1=804217&r2=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java Fri Aug 14 13:26:06 2009
@@ -20,7 +20,6 @@
import org.apache.pivot.util.CalendarDate;
import org.apache.pivot.util.Filter;
-import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Calendar;
import org.apache.pivot.wtk.CalendarButton;
import org.apache.pivot.wtk.CalendarButtonListener;
@@ -30,12 +29,10 @@
import org.apache.pivot.wtk.ComponentMouseButtonListener;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Direction;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Mouse;
-import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
@@ -281,57 +278,6 @@
return consumed;
}
- // Button events
- @Override
- public void buttonPressed(Button button) {
- if (calendarPopup.isOpen()) {
- calendarPopup.close();
- } else {
- CalendarButton calendarButton = (CalendarButton)button;
-
- // Determine the popup's location and preferred size, relative
- // to the button
- Display display = calendarButton.getDisplay();
-
- if (display != null) {
- int width = getWidth();
- int height = getHeight();
-
- Component content = calendarPopup.getContent();
-
- // Ensure that the popup remains within the bounds of the display
- Point buttonLocation = calendarButton.mapPointToAncestor(display, 0, 0);
-
- Dimensions displaySize = display.getSize();
- Dimensions popupSize = content.getPreferredSize();
- int popupHeight = popupSize.height;
-
- int x = buttonLocation.x;
- if (popupSize.width > width
- && x + popupSize.width > displaySize.width) {
- x = buttonLocation.x + width - popupSize.width;
- }
-
- int y = buttonLocation.y + height - 1;
- if (y + popupSize.height > displaySize.height) {
- if (buttonLocation.y - popupSize.height > 0) {
- y = buttonLocation.y - popupSize.height + 1;
- } else {
- popupHeight = displaySize.height - y;
- }
- } else {
- popupHeight = -1;
- }
-
- calendarPopup.setLocation(x, y);
- calendarPopup.setPreferredSize(popupSize.width, popupHeight);
- calendarPopup.open(calendarButton.getWindow());
-
- calendar.requestFocus();
- }
- }
- }
-
// Calendar button events
public void localeChanged(CalendarButton calendarButton, Locale previousLocale) {
calendar.setLocale(calendarButton.getLocale());
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java?rev=804218&r1=804217&r2=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java Fri Aug 14 13:26:06 2009
@@ -19,13 +19,11 @@
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.List;
import org.apache.pivot.util.Filter;
-import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentKeyListener;
import org.apache.pivot.wtk.ComponentMouseButtonListener;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Direction;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
@@ -34,7 +32,6 @@
import org.apache.pivot.wtk.ListButtonSelectionListener;
import org.apache.pivot.wtk.ListView;
import org.apache.pivot.wtk.Mouse;
-import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
@@ -300,64 +297,6 @@
return consumed;
}
- // Button events
- @Override
- public void buttonPressed(Button button) {
- if (listViewPopup.isOpen()) {
- listViewPopup.close();
- } else {
- ListButton listButton = (ListButton)button;
-
- if (listButton.getListData().getLength() > 0) {
- // Determine the popup's location and preferred size, relative
- // to the button
- Display display = listButton.getDisplay();
-
- if (display != null) {
- int width = getWidth();
- int height = getHeight();
-
- Component content = listViewPopup.getContent();
-
- // Ensure that the popup remains within the bounds of the display
- Point buttonLocation = listButton.mapPointToAncestor(display, 0, 0);
-
- Dimensions displaySize = display.getSize();
- Dimensions popupSize = content.getPreferredSize();
- int popupHeight = popupSize.height;
-
- int x = buttonLocation.x;
- if (popupSize.width > width
- && x + popupSize.width > displaySize.width) {
- x = buttonLocation.x + width - popupSize.width;
- }
-
- int y = buttonLocation.y + height - 1;
- if (y + popupSize.height > displaySize.height) {
- if (buttonLocation.y - popupSize.height > 0) {
- y = buttonLocation.y - popupSize.height + 1;
- } else {
- popupHeight = displaySize.height - y;
- }
- } else {
- popupHeight = -1;
- }
-
- listViewPopup.setLocation(x, y);
- listViewPopup.setPreferredSize(popupSize.width, popupHeight);
- listViewPopup.open(listButton.getWindow());
-
- if (listView.getFirstSelectedIndex() == -1
- && listView.getListData().getLength() > 0) {
- listView.setSelectedIndex(0);
- }
-
- listView.requestFocus();
- }
- }
- }
- }
-
// List button events
public void listDataChanged(ListButton listButton, List<?> previousListData) {
listView.setListData(listButton.getListData());
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java?rev=804218&r1=804217&r2=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuButtonSkin.java Fri Aug 14 13:26:06 2009
@@ -16,11 +16,9 @@
*/
package org.apache.pivot.wtk.skin;
-import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Container;
import org.apache.pivot.wtk.ContainerMouseListener;
-import org.apache.pivot.wtk.Dimensions;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Keyboard;
import org.apache.pivot.wtk.Menu;
@@ -28,7 +26,6 @@
import org.apache.pivot.wtk.MenuButtonListener;
import org.apache.pivot.wtk.MenuPopup;
import org.apache.pivot.wtk.Mouse;
-import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
@@ -194,58 +191,6 @@
return consumed;
}
- // Button events
- @Override
- public void buttonPressed(Button button) {
- if (menuPopup.isOpen()) {
- menuPopup.close();
- } else {
- MenuButton menuButton = (MenuButton)getComponent();
- Component content = menuPopup.getContent();
-
- // Determine the popup's location and preferred size, relative
- // to the button
- Window window = menuButton.getWindow();
-
- if (window != null) {
- int width = getWidth();
- int height = getHeight();
-
- Display display = menuButton.getDisplay();
-
- // Ensure that the popup remains within the bounds of the display
- Point buttonLocation = menuButton.mapPointToAncestor(display, 0, 0);
-
- Dimensions displaySize = display.getSize();
- Dimensions popupSize = content.getPreferredSize();
- int popupHeight = popupSize.height;
-
- int x = buttonLocation.x;
- if (popupSize.width > width
- && x + popupSize.width > displaySize.width) {
- x = buttonLocation.x + width - popupSize.width;
- }
-
- int y = buttonLocation.y + height - 1;
- if (y + popupSize.height > displaySize.height) {
- if (buttonLocation.y - popupSize.height > 0) {
- y = buttonLocation.y - popupSize.height + 1;
- } else {
- popupHeight = displaySize.height - y;
- }
- } else {
- popupHeight = -1;
- }
-
- menuPopup.setLocation(x, y);
- menuPopup.setPreferredSize(popupSize.width, popupHeight);
- menuPopup.open(menuButton.getWindow());
-
- menuPopup.requestFocus();
- }
- }
- }
-
public void menuChanged(MenuButton menuButton, Menu previousMenu) {
menuPopup.setMenu(menuButton.getMenu());
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java?rev=804218&r1=804217&r2=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraCalendarButtonSkin.java Fri Aug 14 13:26:06 2009
@@ -36,6 +36,7 @@
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.GraphicsUtilities;
import org.apache.pivot.wtk.Insets;
+import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
@@ -482,6 +483,56 @@
setPadding(Insets.decode(padding));
}
+ // Button events
+ @Override
+ public void buttonPressed(Button button) {
+ if (calendarPopup.isOpen()) {
+ calendarPopup.close();
+ } else {
+ CalendarButton calendarButton = (CalendarButton)button;
+
+ // Determine the popup's location and preferred size, relative
+ // to the button
+ Display display = calendarButton.getDisplay();
+
+ if (display != null) {
+ int width = getWidth();
+ int height = getHeight();
+
+ // Ensure that the popup remains within the bounds of the display
+ Point buttonLocation = calendarButton.mapPointToAncestor(display, 0, 0);
+
+ Dimensions displaySize = display.getSize();
+ Dimensions popupSize = calendarPopup.getPreferredSize();
+ int popupWidth = Math.max(popupSize.width, calendarButton.getWidth());
+ int popupHeight = popupSize.height;
+
+ int x = buttonLocation.x;
+ if (popupWidth > width
+ && x + popupWidth > displaySize.width) {
+ x = buttonLocation.x + width - popupWidth;
+ }
+
+ int y = buttonLocation.y + height - 1;
+ if (y + popupSize.height > displaySize.height) {
+ if (buttonLocation.y - popupSize.height > 0) {
+ y = buttonLocation.y - popupSize.height + 1;
+ } else {
+ popupHeight = displaySize.height - y;
+ }
+ } else {
+ popupHeight = -1;
+ }
+
+ calendarPopup.setLocation(x, y);
+ calendarPopup.setPreferredSize(popupWidth, popupHeight);
+ calendarPopup.open(calendarButton.getWindow());
+
+ calendar.requestFocus();
+ }
+ }
+ }
+
// Calendar button events
public void localeChanged(CalendarButton calendarButton, Locale previousLocale) {
super.localeChanged(calendarButton, previousLocale);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=804218&r1=804217&r2=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Fri Aug 14 13:26:06 2009
@@ -38,6 +38,7 @@
import org.apache.pivot.wtk.ListButton;
import org.apache.pivot.wtk.ListView;
import org.apache.pivot.wtk.Panorama;
+import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
@@ -591,25 +592,76 @@
listView.getStyles().put("highlightBackgroundColor", listHighlightBackgroundColor);
}
+ // Button events
@Override
public void buttonPressed(Button button) {
- if (!listViewPopup.isOpen()) {
- if (listSize == -1) {
- listViewBorder.setPreferredHeight(-1);
- } else {
- if (!listViewBorder.isPreferredHeightSet()) {
- ListView.ItemRenderer itemRenderer = listView.getItemRenderer();
- int height = itemRenderer.getPreferredHeight(-1) * listSize + 2;
+ if (listViewPopup.isOpen()) {
+ listViewPopup.close();
+ } else {
+ ListButton listButton = (ListButton)button;
- if (listViewBorder.getPreferredHeight() > height) {
- listViewBorder.setPreferredHeight(height);
- } else {
+ if (listButton.getListData().getLength() > 0) {
+ // Determine the popup's location and preferred size, relative
+ // to the button
+ Display display = listButton.getDisplay();
+
+ if (display != null) {
+ int width = getWidth();
+ int height = getHeight();
+
+ // Adjust for list size
+ if (listSize == -1) {
listViewBorder.setPreferredHeight(-1);
+ } else {
+ if (!listViewBorder.isPreferredHeightSet()) {
+ ListView.ItemRenderer itemRenderer = listView.getItemRenderer();
+ int borderHeight = itemRenderer.getPreferredHeight(-1) * listSize + 2;
+
+ if (listViewBorder.getPreferredHeight() > borderHeight) {
+ listViewBorder.setPreferredHeight(borderHeight);
+ } else {
+ listViewBorder.setPreferredHeight(-1);
+ }
+ }
+ }
+
+ // Ensure that the popup remains within the bounds of the display
+ Point buttonLocation = listButton.mapPointToAncestor(display, 0, 0);
+
+ Dimensions displaySize = display.getSize();
+ Dimensions popupSize = listViewPopup.getPreferredSize();
+ int popupWidth = Math.max(popupSize.width, listButton.getWidth() - TRIGGER_WIDTH - 1);
+ int popupHeight = popupSize.height;
+
+ int x = buttonLocation.x;
+ if (popupWidth > width
+ && x + popupWidth > displaySize.width) {
+ x = buttonLocation.x + width - popupWidth;
}
+
+ int y = buttonLocation.y + height - 1;
+ if (y + popupSize.height > displaySize.height) {
+ if (buttonLocation.y - popupSize.height > 0) {
+ y = buttonLocation.y - popupSize.height + 1;
+ } else {
+ popupHeight = displaySize.height - y;
+ }
+ } else {
+ popupHeight = -1;
+ }
+
+ listViewPopup.setLocation(x, y);
+ listViewPopup.setPreferredSize(popupWidth, popupHeight);
+ listViewPopup.open(listButton.getWindow());
+
+ if (listView.getFirstSelectedIndex() == -1
+ && listView.getListData().getLength() > 0) {
+ listView.setSelectedIndex(0);
+ }
+
+ listView.requestFocus();
}
}
}
-
- super.buttonPressed(button);
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java?rev=804218&r1=804217&r2=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuButtonSkin.java Fri Aug 14 13:26:06 2009
@@ -35,6 +35,7 @@
import org.apache.pivot.wtk.Insets;
import org.apache.pivot.wtk.MenuButton;
import org.apache.pivot.wtk.Mouse;
+import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
@@ -472,4 +473,56 @@
return super.mouseClick(component, button, x, y, count);
}
+
+ // Button events
+ @Override
+ public void buttonPressed(Button button) {
+ if (menuPopup.isOpen()) {
+ menuPopup.close();
+ } else {
+ MenuButton menuButton = (MenuButton)getComponent();
+
+ // Determine the popup's location and preferred size, relative
+ // to the button
+ Window window = menuButton.getWindow();
+
+ if (window != null) {
+ int width = getWidth();
+ int height = getHeight();
+
+ Display display = menuButton.getDisplay();
+
+ // Ensure that the popup remains within the bounds of the display
+ Point buttonLocation = menuButton.mapPointToAncestor(display, 0, 0);
+
+ Dimensions displaySize = display.getSize();
+ Dimensions popupSize = menuPopup.getPreferredSize();
+ int popupWidth = Math.max(popupSize.width, menuButton.getWidth());
+ int popupHeight = popupSize.height;
+
+ int x = buttonLocation.x;
+ if (popupWidth > width
+ && x + popupWidth > displaySize.width) {
+ x = buttonLocation.x + width - popupWidth;
+ }
+
+ int y = buttonLocation.y + height - 1;
+ if (y + popupSize.height > displaySize.height) {
+ if (buttonLocation.y - popupSize.height > 0) {
+ y = buttonLocation.y - popupSize.height + 1;
+ } else {
+ popupHeight = displaySize.height - y;
+ }
+ } else {
+ popupHeight = -1;
+ }
+
+ menuPopup.setLocation(x, y);
+ menuPopup.setPreferredSize(popupWidth, popupHeight);
+ menuPopup.open(menuButton.getWindow());
+
+ menuPopup.requestFocus();
+ }
+ }
+ }
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java?rev=804218&r1=804217&r2=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPanoramaSkin.java Fri Aug 14 13:26:06 2009
@@ -365,7 +365,8 @@
Component view = panorama.getView();
if (view != null) {
- view.setSize(view.getPreferredSize());
+ Dimensions viewSize = view.getPreferredSize();
+ view.setSize(Math.max(width, viewSize.width), Math.max(height, viewSize.height));
int viewWidth = view.getWidth();
int viewHeight = view.getHeight();
Copied: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java (from r804030, incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java?p2=incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java&p1=incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java&r1=804030&r2=804218&rev=804218&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserSheetTest.java Fri Aug 14 13:26:06 2009
@@ -24,7 +24,7 @@
import org.apache.pivot.wtk.Frame;
import org.apache.pivot.wtkx.WTKXSerializer;
-public class FileBrowserTest implements Application {
+public class FileBrowserSheetTest implements Application {
private Frame frame = null;
public void startup(Display display, Map<String, String> properties)
@@ -34,7 +34,7 @@
FileBrowserSheet fileOpenSheet = new FileBrowserSheet(FileBrowserSheet.Mode.OPEN);
wtkxSerializer.put("fileOpenSheet", fileOpenSheet);
- frame = (Frame)wtkxSerializer.readObject(getClass().getResource("file_browser_test.wtkx"));
+ frame = (Frame)wtkxSerializer.readObject(getClass().getResource("file_browser_sheet_test.wtkx"));
frame.open(display);
}
@@ -53,6 +53,6 @@
}
public static void main(String[] args) {
- DesktopApplicationContext.main(FileBrowserTest.class, args);
+ DesktopApplicationContext.main(FileBrowserSheetTest.class, args);
}
}