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 2018/08/23 16:12:56 UTC
svn commit: r1838738 [1/3] - in /pivot/trunk: core/src/org/apache/pivot/xml/
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/effects/
wtk/src/org/apache/pivot/wtk/media/ wtk/src/org/apache/pivot...
Author: rwhitcomb
Date: Thu Aug 23 16:12:55 2018
New Revision: 1838738
URL: http://svn.apache.org/viewvc?rev=1838738&view=rev
Log:
PIVOT-1032: Fix the "AvoidNestedBlocks" style errors, as well as many other
errors in those files (mostly FinalParameters).
Modified:
pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Picture.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CalendarButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ContainerSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
Modified: pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/xml/XMLSerializer.java Thu Aug 23 16:12:55 2018
@@ -52,13 +52,17 @@ public class XMLSerializer implements Se
public static final String DEFAULT_CHARSET_NAME = "UTF-8";
public static final String XML_EXTENSION = "xml";
public static final String MIME_TYPE = "text/xml";
- public static final int BUFFER_SIZE = 2048;
+ /**
+ * Buffer size to use while reading and writing (should be bigger than the default for
+ * BufferedReader or BufferedWriter, which seems to be 8192 as of Java 7).
+ */
+ public static final int BUFFER_SIZE = 16384;
public XMLSerializer() {
this(Charset.forName(DEFAULT_CHARSET_NAME));
}
- public XMLSerializer(Charset charset) {
+ public XMLSerializer(final Charset charset) {
Utils.checkNull(charset, "charset");
this.charset = charset;
@@ -69,7 +73,7 @@ public class XMLSerializer implements Se
}
@Override
- public Element readObject(InputStream inputStream) throws IOException, SerializationException {
+ public Element readObject(final InputStream inputStream) throws IOException, SerializationException {
Utils.checkNull(inputStream, "inputStream");
Reader reader = new BufferedReader(new InputStreamReader(inputStream, charset), BUFFER_SIZE);
@@ -78,7 +82,7 @@ public class XMLSerializer implements Se
return element;
}
- public Element readObject(Reader reader) throws SerializationException {
+ public Element readObject(final Reader reader) throws SerializationException {
Utils.checkNull(reader, "reader");
// Parse the XML stream
@@ -96,7 +100,7 @@ public class XMLSerializer implements Se
int event = xmlStreamReader.next();
switch (event) {
- case XMLStreamConstants.CHARACTERS: {
+ case XMLStreamConstants.CHARACTERS:
if (!xmlStreamReader.isWhiteSpace()) {
TextNode textNode = new TextNode(xmlStreamReader.getText());
@@ -111,9 +115,8 @@ public class XMLSerializer implements Se
}
break;
- }
- case XMLStreamConstants.START_ELEMENT: {
+ case XMLStreamConstants.START_ELEMENT:
// Create the element
String prefix = xmlStreamReader.getPrefix();
if (prefix != null && prefix.length() == 0) {
@@ -165,9 +168,8 @@ public class XMLSerializer implements Se
current = element;
break;
- }
- case XMLStreamConstants.END_ELEMENT: {
+ case XMLStreamConstants.END_ELEMENT:
// Notify listeners
if (xmlSerializerListeners != null) {
xmlSerializerListeners.endElement(this);
@@ -179,11 +181,9 @@ public class XMLSerializer implements Se
}
break;
- }
- default: {
+ default:
break;
- }
}
}
} catch (XMLStreamException exception) {
@@ -194,7 +194,7 @@ public class XMLSerializer implements Se
}
@Override
- public void writeObject(Element element, OutputStream outputStream) throws IOException,
+ public void writeObject(final Element element, final OutputStream outputStream) throws IOException,
SerializationException {
Utils.checkNull(outputStream, "outputStream");
@@ -204,7 +204,7 @@ public class XMLSerializer implements Se
writer.flush();
}
- public void writeObject(Element element, Writer writer) throws SerializationException {
+ public void writeObject(final Element element, final Writer writer) throws SerializationException {
Utils.checkNull(writer, "writer");
Utils.checkNull(element, "element");
@@ -220,7 +220,7 @@ public class XMLSerializer implements Se
}
}
- private void writeElement(Element element, XMLStreamWriter xmlStreamWriter)
+ private void writeElement(final Element element, final XMLStreamWriter xmlStreamWriter)
throws XMLStreamException, SerializationException {
String namespacePrefix = element.getNamespacePrefix();
String localName = element.getLocalName();
@@ -286,13 +286,13 @@ public class XMLSerializer implements Se
}
}
- private static void writeTextNode(TextNode textNode, XMLStreamWriter xmlStreamWriter)
+ private static void writeTextNode(final TextNode textNode, final XMLStreamWriter xmlStreamWriter)
throws XMLStreamException {
xmlStreamWriter.writeCharacters(textNode.getText());
}
@Override
- public String getMIMEType(Element object) {
+ public String getMIMEType(final Element object) {
return MIME_TYPE;
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Thu Aug 23 16:12:55 2018
@@ -759,62 +759,52 @@ public class TerraAccordionSkin extends
switch (keyCode) {
case KeyCode.KEYPAD_1:
- case KeyCode.N1: {
+ case KeyCode.N1:
selectedIndex = 0;
break;
- }
case KeyCode.KEYPAD_2:
- case KeyCode.N2: {
+ case KeyCode.N2:
selectedIndex = 1;
break;
- }
case KeyCode.KEYPAD_3:
- case KeyCode.N3: {
+ case KeyCode.N3:
selectedIndex = 2;
break;
- }
case KeyCode.KEYPAD_4:
- case KeyCode.N4: {
+ case KeyCode.N4:
selectedIndex = 3;
break;
- }
case KeyCode.KEYPAD_5:
- case KeyCode.N5: {
+ case KeyCode.N5:
selectedIndex = 4;
break;
- }
case KeyCode.KEYPAD_6:
- case KeyCode.N6: {
+ case KeyCode.N6:
selectedIndex = 5;
break;
- }
case KeyCode.KEYPAD_7:
- case KeyCode.N7: {
+ case KeyCode.N7:
selectedIndex = 6;
break;
- }
case KeyCode.KEYPAD_8:
- case KeyCode.N8: {
+ case KeyCode.N8:
selectedIndex = 7;
break;
- }
case KeyCode.KEYPAD_9:
- case KeyCode.N9: {
+ case KeyCode.N9:
selectedIndex = 8;
break;
- }
- default: {
+ default:
break;
- }
}
if (selectedIndex >= 0 && selectedIndex < panels.getLength()
@@ -827,25 +817,22 @@ public class TerraAccordionSkin extends
int selectedIndex = accordion.getSelectedIndex();
switch (keyCode) {
- case KeyCode.UP: {
+ case KeyCode.UP:
do {
selectedIndex--;
} while (selectedIndex >= 0 && !panels.get(selectedIndex).isEnabled());
break;
- }
- case KeyCode.DOWN: {
+ case KeyCode.DOWN:
do {
selectedIndex++;
} while (selectedIndex < n && !panels.get(selectedIndex).isEnabled());
break;
- }
- default: {
+ default:
break;
- }
}
if (selectedIndex >= 0 && selectedIndex < n
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Thu Aug 23 16:12:55 2018
@@ -251,39 +251,39 @@ public class TerraCalendarSkin extends C
int columnIndex = cellIndex % 7;
Component nextButton;
+ TablePane.Row row;
+
switch (keyCode) {
- case KeyCode.UP: {
+ case KeyCode.UP:
do {
rowIndex--;
if (rowIndex < 0) {
rowIndex = 5;
}
- TablePane.Row row = calendarTablePane.getRows().get(rowIndex + 2);
+ row = calendarTablePane.getRows().get(rowIndex + 2);
nextButton = row.get(columnIndex);
} while (!nextButton.isEnabled());
nextButton.requestFocus();
break;
- }
- case KeyCode.DOWN: {
+ case KeyCode.DOWN:
do {
rowIndex++;
if (rowIndex > 5) {
rowIndex = 0;
}
- TablePane.Row row = calendarTablePane.getRows().get(rowIndex + 2);
+ row = calendarTablePane.getRows().get(rowIndex + 2);
nextButton = row.get(columnIndex);
} while (!nextButton.isEnabled());
nextButton.requestFocus();
break;
- }
- case KeyCode.LEFT: {
- TablePane.Row row = calendarTablePane.getRows().get(rowIndex + 2);
+ case KeyCode.LEFT:
+ row = calendarTablePane.getRows().get(rowIndex + 2);
do {
columnIndex--;
@@ -296,10 +296,9 @@ public class TerraCalendarSkin extends C
nextButton.requestFocus();
break;
- }
- case KeyCode.RIGHT: {
- TablePane.Row row = calendarTablePane.getRows().get(rowIndex + 2);
+ case KeyCode.RIGHT:
+ row = calendarTablePane.getRows().get(rowIndex + 2);
do {
columnIndex++;
@@ -312,11 +311,9 @@ public class TerraCalendarSkin extends C
nextButton.requestFocus();
break;
- }
- default: {
+ default:
break;
- }
}
consumed = true;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Thu Aug 23 16:12:55 2018
@@ -285,12 +285,11 @@ public class TerraFileBrowserSheetSkin e
switch (mode) {
case OPEN:
case OPEN_MULTIPLE:
- case SAVE_TO: {
+ case SAVE_TO:
fileBrowserSheet.setSelectedFiles(fileBrowser.getSelectedFiles());
break;
- }
- case SAVE_AS: {
+ case SAVE_AS:
String fileName = saveAsTextInput.getText();
// Contents of the entry field could be:
// 1. Just a new file name in the current root directory
@@ -339,11 +338,9 @@ public class TerraFileBrowserSheetSkin e
fileBrowserSheet.setSelectedFiles(new ArrayList<>(selectedFile));
}
break;
- }
- default: {
+ default:
break;
- }
}
updatingSelection = false;
@@ -364,33 +361,28 @@ public class TerraFileBrowserSheetSkin e
(mode != FileBrowserSheet.Mode.SAVE_TO));
switch (mode) {
- case OPEN: {
+ case OPEN:
saveAsBoxPane.setVisible(false);
fileBrowser.setMultiSelect(false);
break;
- }
- case OPEN_MULTIPLE: {
+ case OPEN_MULTIPLE:
saveAsBoxPane.setVisible(false);
fileBrowser.setMultiSelect(true);
break;
- }
- case SAVE_AS: {
+ case SAVE_AS:
saveAsBoxPane.setVisible(true);
fileBrowser.setMultiSelect(false);
break;
- }
- case SAVE_TO: {
+ case SAVE_TO:
saveAsBoxPane.setVisible(false);
fileBrowser.setMultiSelect(false);
break;
- }
- default: {
+ default:
break;
- }
}
updateDisabledFileFilter();
@@ -451,24 +443,20 @@ public class TerraFileBrowserSheetSkin e
switch (mode) {
case OPEN:
- case OPEN_MULTIPLE: {
+ case OPEN_MULTIPLE:
okButton.setEnabled(selectedFiles.getLength() > 0 && selectedDirectoryCount == 0);
break;
- }
- case SAVE_AS: {
+ case SAVE_AS:
okButton.setEnabled(saveAsTextInput.getCharacterCount() > 0);
break;
- }
- case SAVE_TO: {
+ case SAVE_TO:
okButton.setEnabled(selectedDirectoryCount > 0);
break;
- }
- default: {
+ default:
break;
- }
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java Thu Aug 23 16:12:55 2018
@@ -129,33 +129,28 @@ public class TerraFormSkin extends Conta
Color messageBackgroundColor = null;
switch (messageType) {
- case ERROR: {
+ case ERROR:
messageColor = errorMessageColor;
messageBackgroundColor = errorMessageBackgroundColor;
break;
- }
- case WARNING: {
+ case WARNING:
messageColor = warningMessageColor;
messageBackgroundColor = warningMessageBackgroundColor;
break;
- }
- case QUESTION: {
+ case QUESTION:
messageColor = questionMessageColor;
messageBackgroundColor = questionMessageBackgroundColor;
break;
- }
- case INFO: {
+ case INFO:
messageColor = infoMessageColor;
messageBackgroundColor = infoMessageBackgroundColor;
break;
- }
- default: {
+ default:
break;
- }
}
// Draw the label
@@ -263,33 +258,28 @@ public class TerraFormSkin extends Conta
Color color = null;
Color backgroundColor = null;
switch (messageType) {
- case ERROR: {
+ case ERROR:
color = errorMessageColor;
backgroundColor = errorMessageBackgroundColor;
break;
- }
- case WARNING: {
+ case WARNING:
color = warningMessageColor;
backgroundColor = warningMessageBackgroundColor;
break;
- }
- case QUESTION: {
+ case QUESTION:
color = questionMessageColor;
backgroundColor = questionMessageBackgroundColor;
break;
- }
- case INFO: {
+ case INFO:
color = infoMessageColor;
backgroundColor = infoMessageBackgroundColor;
break;
- }
- default: {
+ default:
break;
- }
}
flagMessageLabel.getStyles().put(Style.color, color);
@@ -828,26 +818,21 @@ public class TerraFormSkin extends Conta
Image flagIcon = null;
switch (messageType) {
- case ERROR: {
+ case ERROR:
flagIcon = errorIcon;
break;
- }
- case WARNING: {
+ case WARNING:
flagIcon = warningIcon;
break;
- }
- case QUESTION: {
+ case QUESTION:
flagIcon = questionIcon;
break;
- }
- case INFO: {
+ case INFO:
flagIcon = infoIcon;
break;
- }
- default: {
+ default:
flagIcon = infoIcon;
break;
- }
}
Label label = labels.get(sectionIndex).get(fieldIndex);
@@ -865,29 +850,24 @@ public class TerraFormSkin extends Conta
Color highlightColor = null;
switch (messageType) {
- case ERROR: {
+ case ERROR:
highlightColor = errorHighlightColor;
break;
- }
- case WARNING: {
+ case WARNING:
highlightColor = warningHighlightColor;
break;
- }
- case QUESTION: {
+ case QUESTION:
highlightColor = questionHighlightColor;
break;
- }
- case INFO: {
+ case INFO:
highlightColor = infoHighlightColor;
break;
- }
- default: {
+ default:
break;
- }
}
Bounds fieldBounds = field.getBounds();
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSplitPaneSkin.java Thu Aug 23 16:12:55 2018
@@ -551,45 +551,36 @@ public class TerraSplitPaneSkin extends
if (!splitPane.isLocked()) {
switch (splitPane.getOrientation()) {
- case HORIZONTAL: {
+ case HORIZONTAL:
switch (splitPane.getPrimaryRegion()) {
- case TOP_LEFT: {
+ case TOP_LEFT:
cursor = Cursor.RESIZE_EAST;
break;
- }
- case BOTTOM_RIGHT: {
+ case BOTTOM_RIGHT:
cursor = Cursor.RESIZE_WEST;
break;
- }
- default: {
+ default:
break;
- }
}
break;
- }
- case VERTICAL: {
+ case VERTICAL:
switch (splitPane.getPrimaryRegion()) {
- case TOP_LEFT: {
+ case TOP_LEFT:
cursor = Cursor.RESIZE_SOUTH;
break;
- }
- case BOTTOM_RIGHT: {
+ case BOTTOM_RIGHT:
cursor = Cursor.RESIZE_NORTH;
break;
- }
- default: {
+ default:
break;
- }
}
break;
- }
- default: {
+ default:
break;
- }
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraSuggestionPopupSkin.java Thu Aug 23 16:12:55 2018
@@ -160,7 +160,7 @@ public class TerraSuggestionPopupSkin ex
TextInput textInput = suggestionPopup.getTextInput();
switch (keyCode) {
- case KeyCode.TAB: {
+ case KeyCode.TAB:
returnFocusToTextInput = false;
suggestionPopup.close(true);
@@ -169,11 +169,9 @@ public class TerraSuggestionPopupSkin ex
textInput.transferFocus(direction);
break;
- }
- default: {
+ default:
break;
- }
}
return false;
@@ -300,19 +298,16 @@ public class TerraSuggestionPopupSkin ex
SuggestionPopup suggestionPopup = (SuggestionPopup) getComponent();
switch (keyCode) {
- case KeyCode.ENTER: {
+ case KeyCode.ENTER:
suggestionPopup.close(true);
break;
- }
- case KeyCode.ESCAPE: {
+ case KeyCode.ESCAPE:
suggestionPopup.close(false);
break;
- }
- default: {
+ default:
break;
- }
}
return false;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Thu Aug 23 16:12:55 2018
@@ -162,7 +162,7 @@ public class TerraTabPaneSkin extends Ta
int preferredWidth = 0;
int preferredHeight = 0;
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
preferredWidth = preferredContentSize.width + buttonPadding.left
+ buttonPadding.right + 2;
@@ -174,9 +174,8 @@ public class TerraTabPaneSkin extends Ta
}
break;
- }
- case VERTICAL: {
+ case VERTICAL:
preferredWidth = preferredContentSize.height + buttonPadding.top
+ buttonPadding.bottom + 2;
@@ -188,11 +187,9 @@ public class TerraTabPaneSkin extends Ta
}
break;
- }
- default: {
+ default:
break;
- }
}
Dimensions preferredSize = new Dimensions(preferredWidth, preferredHeight);
@@ -242,89 +239,75 @@ public class TerraTabPaneSkin extends Ta
if (!themeIsFlat()) {
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
graphics.setPaint(new GradientPaint(width / 2f, 0, buttonBevelColor,
width / 2f, height / 2f, backgroundColor));
graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1
+ buttonCornerRadius, buttonCornerRadius, buttonCornerRadius));
break;
- }
- case VERTICAL: {
+ case VERTICAL:
graphics.setPaint(new GradientPaint(0, height / 2f, buttonBevelColor,
width / 2f, height / 2f, backgroundColor));
graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1
+ buttonCornerRadius, height - 1, buttonCornerRadius, buttonCornerRadius));
break;
- }
- default: {
+ default:
break;
- }
}
// Draw the border
- graphics.setPaint((tabButton.isSelected() || active) ? borderColor
- : inactiveBorderColor);
+ graphics.setPaint((tabButton.isSelected() || active) ? borderColor : inactiveBorderColor);
graphics.setStroke(new BasicStroke(1));
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
graphics.draw(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height
+ buttonCornerRadius - 1, buttonCornerRadius, buttonCornerRadius));
break;
- }
- case VERTICAL: {
+ case VERTICAL:
graphics.draw(new RoundRectangle2D.Double(0.5, 0.5, width + buttonCornerRadius
- 1, height - 1, buttonCornerRadius, buttonCornerRadius));
break;
- }
- default: {
+ default:
break;
- }
}
if (!(tabButton.isSelected() || active)) {
graphics.setPaint(borderColor);
// Draw divider
switch (tabOrientation) {
- case HORIZONTAL: {
- graphics.draw(new Line2D.Double(0.5, height - 0.5, width - 0.5,
- height - 0.5));
+ case HORIZONTAL:
+ graphics.draw(new Line2D.Double(0.5, height - 0.5, width - 0.5, height - 0.5));
break;
- }
- case VERTICAL: {
+ case VERTICAL:
graphics.draw(new Line2D.Double(width - 0.5, 0.5, width - 0.5, height - 0.5));
break;
- }
- default: {
+ default:
break;
- }
}
}
} else {
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
graphics.setPaint(backgroundColor);
graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1, height - 1
+ buttonCornerRadius, buttonCornerRadius, buttonCornerRadius));
break;
- }
- case VERTICAL: {
+ case VERTICAL:
graphics.setPaint(backgroundColor);
graphics.fill(new RoundRectangle2D.Double(0.5, 0.5, width - 1
+ buttonCornerRadius, height - 1, buttonCornerRadius, buttonCornerRadius));
break;
- }
- default: {
+ default:
break;
- }
}
}
@@ -336,40 +319,39 @@ public class TerraTabPaneSkin extends Ta
Graphics2D contentGraphics = (Graphics2D) graphics.create();
GraphicsUtilities.setAntialiasingOff(contentGraphics);
+ int contentWidth;
+
switch (tabOrientation) {
- case HORIZONTAL: {
- int contentWidth = getWidth() - (buttonPadding.left + buttonPadding.right + 2);
+ case HORIZONTAL:
+ contentWidth = getWidth() - (buttonPadding.getWidth() + 2);
if (tabPane.isCloseable() && tabButton.isSelected()) {
contentWidth -= (CLOSE_TRIGGER_SIZE + buttonSpacing);
}
dataRenderer.setSize(Math.max(contentWidth, 0),
- Math.max(getHeight() - (buttonPadding.top + buttonPadding.bottom + 2), 0));
+ Math.max(getHeight() - (buttonPadding.getHeight() + 2), 0));
contentGraphics.translate(buttonPadding.left + 1, buttonPadding.top + 1);
break;
- }
- case VERTICAL: {
- int contentWidth = getHeight() - (buttonPadding.top + buttonPadding.bottom + 2);
+ case VERTICAL:
+ contentWidth = getHeight() - (buttonPadding.getHeight() + 2);
if (tabPane.isCloseable() && tabButton.isSelected()) {
contentWidth -= (CLOSE_TRIGGER_SIZE + buttonSpacing);
}
dataRenderer.setSize(Math.max(contentWidth, 0),
- Math.max(getWidth() - (buttonPadding.left + buttonPadding.right + 2), 0));
+ Math.max(getWidth() - (buttonPadding.getWidth() + 2), 0));
contentGraphics.translate(buttonPadding.top + 1, buttonPadding.left + 1);
contentGraphics.rotate(-Math.PI / 2d);
contentGraphics.translate(-dataRenderer.getWidth(), 0);
break;
- }
- default: {
+ default:
break;
- }
}
contentGraphics.clipRect(0, 0, dataRenderer.getWidth(), dataRenderer.getHeight());
@@ -384,27 +366,24 @@ public class TerraTabPaneSkin extends Ta
int x = 0;
int y = 0;
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
x = width - (buttonPadding.right + CLOSE_TRIGGER_SIZE + 1);
y = (height - CLOSE_TRIGGER_SIZE) / 2;
break;
- }
- case VERTICAL: {
+ case VERTICAL:
x = (width - CLOSE_TRIGGER_SIZE) / 2;
y = height - (buttonPadding.bottom + CLOSE_TRIGGER_SIZE + 1);
break;
- }
- default: {
+ default:
break;
- }
}
- graphics.draw(new Line2D.Double(x, y, x + CLOSE_TRIGGER_SIZE - 1, y
- + CLOSE_TRIGGER_SIZE - 1));
- graphics.draw(new Line2D.Double(x, y + CLOSE_TRIGGER_SIZE - 1, x
- + CLOSE_TRIGGER_SIZE - 1, y));
+ graphics.draw(new Line2D.Double(x, y, x + CLOSE_TRIGGER_SIZE - 1,
+ y + CLOSE_TRIGGER_SIZE - 1));
+ graphics.draw(new Line2D.Double(x, y + CLOSE_TRIGGER_SIZE - 1,
+ x + CLOSE_TRIGGER_SIZE - 1, y));
}
}
@@ -453,23 +432,20 @@ public class TerraTabPaneSkin extends Ta
// Include an extra 2 pixels around the trigger for ease of use
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
bounds = new Bounds(getWidth() - (CLOSE_TRIGGER_SIZE + buttonPadding.right + 1)
- 2, (getHeight() - CLOSE_TRIGGER_SIZE) / 2 - 2, CLOSE_TRIGGER_SIZE + 4,
CLOSE_TRIGGER_SIZE + 4);
break;
- }
- case VERTICAL: {
+ case VERTICAL:
bounds = new Bounds((getWidth() - CLOSE_TRIGGER_SIZE) / 2 - 2, getHeight()
- (CLOSE_TRIGGER_SIZE + buttonPadding.bottom + 1) - 2,
CLOSE_TRIGGER_SIZE + 4, CLOSE_TRIGGER_SIZE + 4);
break;
- }
- default: {
+ default:
break;
- }
}
return bounds;
@@ -646,7 +622,7 @@ public class TerraTabPaneSkin extends Ta
Component corner = tabPane.getCorner();
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
if (height != -1) {
if (corner != null) {
height = Math.max(
@@ -671,9 +647,8 @@ public class TerraTabPaneSkin extends Ta
preferredWidth = Math.max(preferredWidth, buttonAreaPreferredWidth);
break;
- }
- case VERTICAL: {
+ case VERTICAL:
if (height != -1) {
height = Math.max(height - (padding.top + padding.bottom + 2), 0);
}
@@ -699,11 +674,9 @@ public class TerraTabPaneSkin extends Ta
}
break;
- }
- default: {
+ default:
break;
- }
}
return preferredWidth;
@@ -719,7 +692,7 @@ public class TerraTabPaneSkin extends Ta
Component corner = tabPane.getCorner();
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
if (width != -1) {
width = Math.max(width - (padding.left + padding.right + 2), 0);
}
@@ -745,9 +718,8 @@ public class TerraTabPaneSkin extends Ta
}
break;
- }
- case VERTICAL: {
+ case VERTICAL:
if (width != -1) {
if (corner != null) {
width = Math.max(
@@ -771,11 +743,9 @@ public class TerraTabPaneSkin extends Ta
preferredHeight = Math.max(preferredHeight, buttonAreaPreferredHeight);
break;
- }
- default: {
+ default:
break;
- }
}
return preferredHeight;
@@ -792,7 +762,7 @@ public class TerraTabPaneSkin extends Ta
Component corner = tabPane.getCorner();
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
if (selectedTab == null && selectionChangeTransition == null) {
preferredWidth = getPreferredTabWidth(-1) + (padding.left + padding.right + 2);
preferredHeight = 1;
@@ -823,9 +793,8 @@ public class TerraTabPaneSkin extends Ta
preferredWidth = Math.max(preferredWidth, buttonAreaPreferredWidth);
break;
- }
- case VERTICAL: {
+ case VERTICAL:
if (selectedTab == null && selectionChangeTransition == null) {
preferredWidth = 1;
preferredHeight = getPreferredTabHeight(-1)
@@ -858,12 +827,11 @@ public class TerraTabPaneSkin extends Ta
preferredHeight = Math.max(preferredHeight, buttonAreaPreferredHeight);
break;
- }
- default: {
+ default:
preferredWidth = 0;
preferredHeight = 0;
- }
+ break;
}
return new Dimensions(preferredWidth, preferredHeight);
@@ -933,12 +901,14 @@ public class TerraTabPaneSkin extends Ta
Component corner = tabPane.getCorner();
Dimensions buttonPanoramaSize = tabButtonPanorama.getPreferredSize();
+ int buttonPanoramaWidth, buttonPanoramaHeight;
+ int buttonPanoramaX, buttonPanoramaY;
switch (tabOrientation) {
- case HORIZONTAL: {
- int buttonPanoramaWidth = Math.min(width, buttonPanoramaSize.width);
- int buttonPanoramaHeight = buttonPanoramaSize.height;
- int buttonPanoramaY = 0;
+ case HORIZONTAL:
+ buttonPanoramaWidth = Math.min(width, buttonPanoramaSize.width);
+ buttonPanoramaHeight = buttonPanoramaSize.height;
+ buttonPanoramaY = 0;
if (corner != null) {
int cornerWidth = Math.max(width - buttonPanoramaWidth - 2,
@@ -972,12 +942,11 @@ public class TerraTabPaneSkin extends Ta
0);
break;
- }
- case VERTICAL: {
- int buttonPanoramaWidth = buttonPanoramaSize.width;
- int buttonPanoramaHeight = Math.min(height, buttonPanoramaSize.height);
- int buttonPanoramaX = 0;
+ case VERTICAL:
+ buttonPanoramaWidth = buttonPanoramaSize.width;
+ buttonPanoramaHeight = Math.min(height, buttonPanoramaSize.height);
+ buttonPanoramaX = 0;
if (corner != null) {
int cornerHeight = Math.max(height - buttonPanoramaHeight - 2,
@@ -1009,11 +978,9 @@ public class TerraTabPaneSkin extends Ta
tabHeight = Math.max(height - (padding.top + padding.bottom + 2), 0);
break;
- }
- default: {
+ default:
break;
- }
}
// Lay out the tabs
@@ -1024,19 +991,16 @@ public class TerraTabPaneSkin extends Ta
clipDecorator.setSize(tabWidth, tabHeight);
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
tab.setSize(tabWidth, getPreferredTabHeight(tabWidth));
break;
- }
- case VERTICAL: {
+ case VERTICAL:
tab.setSize(getPreferredTabWidth(tabHeight), tabHeight);
break;
- }
- default: {
+ default:
break;
- }
}
} else {
tab.setSize(tabWidth, tabHeight);
@@ -1060,27 +1024,24 @@ public class TerraTabPaneSkin extends Ta
int height = 0;
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
x = 0;
y = Math.max(tabButtonPanorama.getY() + tabButtonPanorama.getHeight() - 1, 0);
width = tabPaneBounds.width;
height = Math.max(tabPaneBounds.height - y, 0);
break;
- }
- case VERTICAL: {
+ case VERTICAL:
x = Math.max(tabButtonPanorama.getX() + tabButtonPanorama.getWidth() - 1, 0);
y = 0;
width = Math.max(tabPaneBounds.width - x, 0);
height = tabPaneBounds.height;
break;
- }
- default: {
+ default:
break;
- }
}
TabButton activeTabButton;
@@ -1114,36 +1075,32 @@ public class TerraTabPaneSkin extends Ta
graphics.draw(new Line2D.Double(left, bottom, right, bottom));
// Draw the left and top borders
+ Point selectedTabButtonLocation;
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
graphics.draw(new Line2D.Double(left, top, left, bottom));
- Point selectedTabButtonLocation = activeTabButton.mapPointToAncestor(tabPane,
- 0, 0);
+ selectedTabButtonLocation = activeTabButton.mapPointToAncestor(tabPane, 0, 0);
graphics.draw(new Line2D.Double(left, top, selectedTabButtonLocation.x + 0.5,
top));
graphics.draw(new Line2D.Double(selectedTabButtonLocation.x
+ activeTabButton.getWidth() - 0.5, top, right, top));
break;
- }
- case VERTICAL: {
+ case VERTICAL:
graphics.draw(new Line2D.Double(left, top, right, top));
- Point selectedTabButtonLocation = activeTabButton.mapPointToAncestor(tabPane,
- 0, 0);
+ selectedTabButtonLocation = activeTabButton.mapPointToAncestor(tabPane, 0, 0);
graphics.draw(new Line2D.Double(left, top, left,
selectedTabButtonLocation.y + 0.5));
graphics.draw(new Line2D.Double(left, selectedTabButtonLocation.y
+ activeTabButton.getHeight() - 0.5, left, bottom));
break;
- }
- default: {
+ default:
break;
- }
}
}
}
@@ -1377,17 +1334,14 @@ public class TerraTabPaneSkin extends Ta
tabButtonBoxPane.setOrientation(tabOrientation);
switch (tabOrientation) {
- case HORIZONTAL: {
+ case HORIZONTAL:
tabButtonBoxPane.getStyles().put(Style.horizontalAlignment, HorizontalAlignment.LEFT);
break;
- }
- case VERTICAL: {
+ case VERTICAL:
tabButtonBoxPane.getStyles().put(Style.verticalAlignment, VerticalAlignment.TOP);
break;
- }
- default: {
+ default:
break;
- }
}
}
@@ -1431,58 +1385,49 @@ public class TerraTabPaneSkin extends Ta
switch (keyCode) {
case KeyCode.KEYPAD_1:
- case KeyCode.N1: {
+ case KeyCode.N1:
selectedIndex = 0;
break;
- }
case KeyCode.KEYPAD_2:
- case KeyCode.N2: {
+ case KeyCode.N2:
selectedIndex = 1;
break;
- }
case KeyCode.KEYPAD_3:
- case KeyCode.N3: {
+ case KeyCode.N3:
selectedIndex = 2;
break;
- }
case KeyCode.KEYPAD_4:
- case KeyCode.N4: {
+ case KeyCode.N4:
selectedIndex = 3;
break;
- }
case KeyCode.KEYPAD_5:
- case KeyCode.N5: {
+ case KeyCode.N5:
selectedIndex = 4;
break;
- }
case KeyCode.KEYPAD_6:
- case KeyCode.N6: {
+ case KeyCode.N6:
selectedIndex = 5;
break;
- }
case KeyCode.KEYPAD_7:
- case KeyCode.N7: {
+ case KeyCode.N7:
selectedIndex = 6;
break;
- }
case KeyCode.KEYPAD_8:
- case KeyCode.N8: {
+ case KeyCode.N8:
selectedIndex = 7;
break;
- }
case KeyCode.KEYPAD_9:
- case KeyCode.N9: {
+ case KeyCode.N9:
selectedIndex = 8;
break;
- }
case KeyCode.TAB:
selectedIndex = tabPane.getSelectedIndex();
@@ -1501,9 +1446,8 @@ public class TerraTabPaneSkin extends Ta
}
break;
- default: {
+ default:
break;
- }
}
if (selectedIndex >= 0 && selectedIndex < tabs.getLength()
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTableViewHeaderSkin.java Thu Aug 23 16:12:55 2018
@@ -74,23 +74,20 @@ public class TerraTableViewHeaderSkin ex
GeneralPath shape = new GeneralPath();
switch (sortDirection) {
- case ASCENDING: {
+ case ASCENDING:
shape.moveTo(0, 3);
shape.lineTo(3, 0);
shape.lineTo(6, 3);
break;
- }
- case DESCENDING: {
+ case DESCENDING:
shape.moveTo(0, 0);
shape.lineTo(3, 3);
shape.lineTo(6, 0);
break;
- }
- default: {
+ default:
break;
- }
}
shape.closePath();
@@ -325,19 +322,16 @@ public class TerraTableViewHeaderSkin ex
if (sortDirection != null) {
switch (sortDirection) {
- case ASCENDING: {
+ case ASCENDING:
sortImage = sortAscendingImage;
break;
- }
- case DESCENDING: {
+ case DESCENDING:
sortImage = sortDescendingImage;
break;
- }
- default: {
+ default:
break;
- }
}
}
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTextInputSkin.java Thu Aug 23 16:12:55 2018
@@ -448,25 +448,26 @@ public class TerraTextInputSkin extends
private int getAlignmentDeltaX(final TextLayout textLayout) {
int alignmentDeltaX = 0;
+
+ TextInput textInput;
+ int txtWidth, availWidth;
+
switch (horizontalAlignment) {
case LEFT:
default:
break;
- case CENTER: {
- TextInput textInput = (TextInput) getComponent();
- int txtWidth = getTextWidth(textLayout);
- int availWidth = textInput.getWidth() - (padding.getWidth() + 2);
+ case CENTER:
+ textInput = (TextInput) getComponent();
+ txtWidth = getTextWidth(textLayout);
+ availWidth = textInput.getWidth() - (padding.getWidth() + 2);
alignmentDeltaX = (availWidth - txtWidth) / 2;
break;
- }
- case RIGHT: {
- TextInput textInput = (TextInput) getComponent();
- int txtWidth = getTextWidth(textLayout);
- int availWidth = textInput.getWidth()
- - (padding.getWidth() + 2 + caret.width);
+ case RIGHT:
+ textInput = (TextInput) getComponent();
+ txtWidth = getTextWidth(textLayout);
+ availWidth = textInput.getWidth() - (padding.getWidth() + 2 + caret.width);
alignmentDeltaX = (availWidth - txtWidth);
break;
- }
}
return alignmentDeltaX;
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Thu Aug 23 16:12:55 2018
@@ -1673,7 +1673,7 @@ public class TerraTreeViewSkin extends C
SelectMode selectMode = treeView.getSelectMode();
switch (keyCode) {
- case KeyCode.UP: {
+ case KeyCode.UP:
if (selectMode != SelectMode.NONE) {
Path firstSelectedPath = treeView.getFirstSelectedPath();
@@ -1703,9 +1703,8 @@ public class TerraTreeViewSkin extends C
consumed = true;
}
break;
- }
- case KeyCode.DOWN: {
+ case KeyCode.DOWN:
if (selectMode != SelectMode.NONE) {
Path lastSelectedPath = treeView.getLastSelectedPath();
@@ -1736,9 +1735,8 @@ public class TerraTreeViewSkin extends C
consumed = true;
}
break;
- }
- case KeyCode.LEFT: {
+ case KeyCode.LEFT:
if (showBranchControls) {
Sequence<Path> paths = treeView.getSelectedPaths();
@@ -1755,9 +1753,8 @@ public class TerraTreeViewSkin extends C
}
}
break;
- }
- case KeyCode.RIGHT: {
+ case KeyCode.RIGHT:
if (showBranchControls) {
Sequence<Path> paths = treeView.getSelectedPaths();
@@ -1774,7 +1771,6 @@ public class TerraTreeViewSkin extends C
}
}
break;
- }
default:
consumed = super.keyPressed(component, keyCode, keyLocation);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraVFSBrowserSheetSkin.java Thu Aug 23 16:12:55 2018
@@ -360,16 +360,15 @@ public class TerraVFSBrowserSheetSkin ex
switch (mode) {
case OPEN:
case OPEN_MULTIPLE:
- case SAVE_TO: {
+ case SAVE_TO:
try {
fileBrowserSheet.setSelectedFiles(fileBrowser.getSelectedFiles());
} catch (FileSystemException fse) {
throw new RuntimeException(fse);
}
break;
- }
- case SAVE_AS: {
+ case SAVE_AS:
String fileName = saveAsTextInput.getText();
// Contents of the entry field could be:
// 1. Just a new file name in the current root directory
@@ -427,7 +426,7 @@ public class TerraVFSBrowserSheetSkin ex
vote = Vote.DENY;
}
break;
- }
+
default:
break;
}
@@ -455,29 +454,26 @@ public class TerraVFSBrowserSheetSkin ex
(mode != VFSBrowserSheet.Mode.SAVE_TO));
switch (mode) {
- case OPEN: {
+ case OPEN:
saveAsBoxPane.setVisible(false);
fileBrowser.setMultiSelect(false);
break;
- }
- case OPEN_MULTIPLE: {
+ case OPEN_MULTIPLE:
saveAsBoxPane.setVisible(false);
fileBrowser.setMultiSelect(true);
break;
- }
- case SAVE_AS: {
+ case SAVE_AS:
saveAsBoxPane.setVisible(true);
fileBrowser.setMultiSelect(false);
break;
- }
- case SAVE_TO: {
+ case SAVE_TO:
saveAsBoxPane.setVisible(false);
fileBrowser.setMultiSelect(false);
break;
- }
+
default:
break;
}
@@ -525,8 +521,7 @@ public class TerraVFSBrowserSheetSkin ex
if (fileBrowser.getSelectedFiles().getLength() == 0 && selectedFiles.getLength() == 1) {
// The file does not currently exist; set the file name in the
- // text input if the parent directory is the same as the root
- // directory
+ // text input if the parent directory is the same as the root directory
FileObject selectedFile = selectedFiles.get(0);
try {
@@ -567,20 +562,18 @@ public class TerraVFSBrowserSheetSkin ex
switch (mode) {
case OPEN:
- case OPEN_MULTIPLE: {
+ case OPEN_MULTIPLE:
okButton.setEnabled(selectedFiles.getLength() > 0 && selectedDirectoryCount == 0);
break;
- }
- case SAVE_AS: {
+ case SAVE_AS:
okButton.setEnabled(saveAsTextInput.getCharacterCount() > 0);
break;
- }
- case SAVE_TO: {
+ case SAVE_TO:
okButton.setEnabled(selectedDirectoryCount > 0);
break;
- }
+
default:
break;
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Thu Aug 23 16:12:55 2018
@@ -957,20 +957,17 @@ public abstract class ApplicationContext
super.processComponentEvent(event);
switch (event.getID()) {
- case ComponentEvent.COMPONENT_RESIZED: {
+ case ComponentEvent.COMPONENT_RESIZED:
if (scale == 1) {
display.setSize(Math.max(getWidth(), 0), Math.max(getHeight(), 0));
} else {
display.setSize(Math.max((int) Math.ceil(getWidth() / scale), 0),
Math.max((int) Math.ceil(getHeight() / scale), 0));
}
-
break;
- }
- default: {
+ default:
break;
- }
}
}
@@ -979,25 +976,20 @@ public abstract class ApplicationContext
super.processFocusEvent(event);
switch (event.getID()) {
- case FocusEvent.FOCUS_GAINED: {
+ case FocusEvent.FOCUS_GAINED:
if (focusedComponent != null && focusedComponent.isShowing()
&& !focusedComponent.isBlocked()) {
focusedComponent.requestFocus();
}
-
break;
- }
- case FocusEvent.FOCUS_LOST: {
+ case FocusEvent.FOCUS_LOST:
focusedComponent = Component.getFocusedComponent();
Component.clearFocus();
-
break;
- }
- default: {
+ default:
break;
- }
}
}
@@ -1034,24 +1026,20 @@ public abstract class ApplicationContext
// Get the button associated with this event
Mouse.Button button = null;
switch (event.getButton()) {
- case MouseEvent.BUTTON1: {
+ case MouseEvent.BUTTON1:
button = Mouse.Button.LEFT;
break;
- }
- case MouseEvent.BUTTON2: {
+ case MouseEvent.BUTTON2:
button = Mouse.Button.MIDDLE;
break;
- }
- case MouseEvent.BUTTON3: {
+ case MouseEvent.BUTTON3:
button = Mouse.Button.RIGHT;
break;
- }
- default: {
+ default:
break;
- }
}
// Process the event
@@ -1059,19 +1047,16 @@ public abstract class ApplicationContext
if (eventID == MouseEvent.MOUSE_ENTERED || eventID == MouseEvent.MOUSE_EXITED) {
try {
switch (eventID) {
- case MouseEvent.MOUSE_ENTERED: {
+ case MouseEvent.MOUSE_ENTERED:
display.mouseOver();
break;
- }
- case MouseEvent.MOUSE_EXITED: {
+ case MouseEvent.MOUSE_EXITED:
display.mouseOut();
break;
- }
- default: {
+ default:
break;
- }
}
} catch (Throwable exception) {
handleUncaughtException(exception);
@@ -1096,12 +1081,14 @@ public abstract class ApplicationContext
// Delegate the event to the owner
try {
+ boolean consumed;
+
switch (eventID) {
- case MouseEvent.MOUSE_PRESSED: {
+ case MouseEvent.MOUSE_PRESSED:
requestFocus();
requestFocusInWindow();
- boolean consumed = mouseOwner.mouseDown(button, x, y);
+ consumed = mouseOwner.mouseDown(button, x, y);
if (button == Mouse.Button.LEFT) {
dragLocation = new Point(x, y);
@@ -1138,8 +1125,7 @@ public abstract class ApplicationContext
}
} while (component != null && component.isEnabled());
- // Show the context menu if it contains any
- // sections
+ // Show the context menu if it contains any sections
if (menu.getSections().getLength() > 0) {
menuPopup = new MenuPopup(menu);
@@ -1173,11 +1159,10 @@ public abstract class ApplicationContext
}
break;
- }
- case MouseEvent.MOUSE_RELEASED: {
+ case MouseEvent.MOUSE_RELEASED:
if (dragDescendant == null) {
- boolean consumed = mouseOwner.mouseUp(button, x, y);
+ consumed = mouseOwner.mouseUp(button, x, y);
if (consumed) {
event.consume();
@@ -1212,11 +1197,9 @@ public abstract class ApplicationContext
dragLocation = null;
break;
- }
- default: {
+ default:
break;
- }
}
} catch (Throwable exception) {
handleUncaughtException(exception);
@@ -1235,7 +1218,7 @@ public abstract class ApplicationContext
try {
switch (event.getID()) {
case MouseEvent.MOUSE_MOVED:
- case MouseEvent.MOUSE_DRAGGED: {
+ case MouseEvent.MOUSE_DRAGGED:
if (dragDescendant == null) {
// A drag is not active
Component mouseCapturer = Mouse.getCapturer();
@@ -1254,8 +1237,7 @@ public abstract class ApplicationContext
if (dragLocation != null
&& (Math.abs(x - dragLocation.x) > dragThreshold
|| Math.abs(y - dragLocation.y) > dragThreshold)) {
- // The user has dragged the mouse past the
- // drag threshold; try
+ // The user has dragged the mouse past the drag threshold; try
// to find a drag source
dragDescendant = display.getDescendantAt(dragLocation.x,
dragLocation.y);
@@ -1266,14 +1248,12 @@ public abstract class ApplicationContext
}
if (dragDescendant == null || dragDescendant.isBlocked()) {
- // There was nothing to drag, so clear
- // the drag location
+ // There was nothing to drag, so clear the drag location
dragDescendant = null;
dragLocation = null;
} else {
DragSource dragSource = dragDescendant.getDragSource();
- dragLocation = dragDescendant.mapPointFromAncestor(display,
- x, y);
+ dragLocation = dragDescendant.mapPointFromAncestor(display, x, y);
if (dragLocation == null) {
dragLocation = display.getMouseLocation();
}
@@ -1283,11 +1263,9 @@ public abstract class ApplicationContext
dragLocation.x, dragLocation.y)) {
// A drag has started
if (dragSource.isNative()) {
- startNativeDrag(dragSource, dragDescendant,
- event);
+ startNativeDrag(dragSource, dragDescendant, event);
- // Clear the drag state since it
- // is not used for
+ // Clear the drag state since it is not used for
// native drags
dragDescendant = null;
dragLocation = null;
@@ -1306,8 +1284,7 @@ public abstract class ApplicationContext
// Get the drag content
dragManifest = dragSource.getContent();
- // Get the initial user drop
- // action
+ // Get the initial user drop action
userDropAction = getUserDropAction(event);
// Repaint the drag visual
@@ -1341,8 +1318,7 @@ public abstract class ApplicationContext
if (dragLocation != null) {
DragSource dragSource = dragDescendant.getDragSource();
- // Get the previous and current drop descendant
- // and call
+ // Get the previous and current drop descendant and call
// move or exit/enter as appropriate
Component previousDropDescendant = dropDescendant;
dropDescendant = getDropDescendant(x, y);
@@ -1390,11 +1366,9 @@ public abstract class ApplicationContext
}
break;
- }
- default: {
+ default:
break;
- }
}
} catch (Throwable exception) {
handleUncaughtException(exception);
@@ -1412,25 +1386,22 @@ public abstract class ApplicationContext
// Get the scroll type
Mouse.ScrollType scrollType = null;
switch (event.getScrollType()) {
- case MouseWheelEvent.WHEEL_BLOCK_SCROLL: {
+ case MouseWheelEvent.WHEEL_BLOCK_SCROLL:
scrollType = Mouse.ScrollType.BLOCK;
break;
- }
- case MouseWheelEvent.WHEEL_UNIT_SCROLL: {
+ case MouseWheelEvent.WHEEL_UNIT_SCROLL:
scrollType = Mouse.ScrollType.UNIT;
break;
- }
- default: {
+ default:
break;
- }
}
// Process the event
try {
switch (event.getID()) {
- case MouseEvent.MOUSE_WHEEL: {
+ case MouseEvent.MOUSE_WHEEL:
if (Keyboard.isPressed(Keyboard.Modifier.CTRL)
&& Keyboard.isPressed(Keyboard.Modifier.SHIFT)) {
// Mouse wheel scaling
@@ -1466,11 +1437,9 @@ public abstract class ApplicationContext
}
}
break;
- }
- default: {
+ default:
break;
- }
}
} catch (Throwable exception) {
handleUncaughtException(exception);
@@ -1510,40 +1479,36 @@ public abstract class ApplicationContext
// Get the key location
Keyboard.KeyLocation keyLocation = null;
switch (awtKeyLocation) {
- case KeyEvent.KEY_LOCATION_STANDARD: {
+ case KeyEvent.KEY_LOCATION_STANDARD:
keyLocation = Keyboard.KeyLocation.STANDARD;
break;
- }
- case KeyEvent.KEY_LOCATION_LEFT: {
+ case KeyEvent.KEY_LOCATION_LEFT:
keyLocation = Keyboard.KeyLocation.LEFT;
break;
- }
- case KeyEvent.KEY_LOCATION_RIGHT: {
+ case KeyEvent.KEY_LOCATION_RIGHT:
keyLocation = Keyboard.KeyLocation.RIGHT;
break;
- }
- case KeyEvent.KEY_LOCATION_NUMPAD: {
+ case KeyEvent.KEY_LOCATION_NUMPAD:
keyLocation = Keyboard.KeyLocation.KEYPAD;
break;
- }
- default: {
+ default:
break;
- }
}
if (dragDescendant == null) {
// Process the event
Component focusedComponentLocal = Component.getFocusedComponent();
- switch (event.getID()) {
- case KeyEvent.KEY_PRESSED: {
- boolean consumed = false;
+ boolean consumed = false;
+ int keyCode;
- int keyCode = event.getKeyCode();
+ switch (event.getID()) {
+ case KeyEvent.KEY_PRESSED:
+ keyCode = event.getKeyCode();
if (Keyboard.isPressed(Keyboard.Modifier.CTRL)
&& Keyboard.isPressed(Keyboard.Modifier.SHIFT)) {
@@ -1581,12 +1546,9 @@ public abstract class ApplicationContext
}
break;
- }
-
- case KeyEvent.KEY_RELEASED: {
- boolean consumed = false;
- int keyCode = event.getKeyCode();
+ case KeyEvent.KEY_RELEASED:
+ keyCode = event.getKeyCode();
try {
if (focusedComponentLocal == null) {
@@ -1612,11 +1574,8 @@ public abstract class ApplicationContext
}
break;
- }
-
- case KeyEvent.KEY_TYPED: {
- boolean consumed = false;
+ case KeyEvent.KEY_TYPED:
char keyChar = event.getKeyChar();
try {
@@ -1642,11 +1601,9 @@ public abstract class ApplicationContext
}
break;
- }
- default: {
+ default:
break;
- }
}
} else {
DragSource dragSource = dragDescendant.getDragSource();
@@ -2183,24 +2140,20 @@ public abstract class ApplicationContext
DropAction dropAction = null;
switch (nativeDropAction) {
- case DnDConstants.ACTION_COPY: {
+ case DnDConstants.ACTION_COPY:
dropAction = DropAction.COPY;
break;
- }
- case DnDConstants.ACTION_MOVE: {
+ case DnDConstants.ACTION_MOVE:
dropAction = DropAction.MOVE;
break;
- }
- case DnDConstants.ACTION_LINK: {
+ case DnDConstants.ACTION_LINK:
dropAction = DropAction.LINK;
break;
- }
- default: {
+ default:
break;
- }
}
return dropAction;
@@ -2229,21 +2182,20 @@ public abstract class ApplicationContext
if (dropAction != null) {
switch (dropAction) {
- case COPY: {
+ case COPY:
nativeDropAction = DnDConstants.ACTION_COPY;
break;
- }
- case MOVE: {
+
+ case MOVE:
nativeDropAction = DnDConstants.ACTION_MOVE;
break;
- }
- case LINK: {
+
+ case LINK:
nativeDropAction = DnDConstants.ACTION_LINK;
break;
- }
- default: {
+
+ default:
break;
- }
}
}
@@ -2258,21 +2210,20 @@ public abstract class ApplicationContext
// Show the cursor for the drop action returned by the
// drop target
switch (dropAction) {
- case COPY: {
+ case COPY:
cursor = java.awt.dnd.DragSource.DefaultCopyDrop;
break;
- }
- case MOVE: {
+
+ case MOVE:
cursor = java.awt.dnd.DragSource.DefaultMoveDrop;
break;
- }
- case LINK: {
+
+ case LINK:
cursor = java.awt.dnd.DragSource.DefaultLinkDrop;
break;
- }
- default: {
+
+ default:
break;
- }
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=1838738&r1=1838737&r2=1838738&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Thu Aug 23 16:12:55 2018
@@ -240,17 +240,14 @@ public final class DesktopApplicationCon
super.processWindowEvent(event);
switch (event.getID()) {
- case WindowEvent.WINDOW_CLOSING: {
+ case WindowEvent.WINDOW_CLOSING:
exit();
break;
- }
- case WindowEvent.WINDOW_CLOSED: {
+ case WindowEvent.WINDOW_CLOSED:
System.exit(0);
break;
- }
- default: {
+ default:
break;
- }
}
}
@@ -259,25 +256,22 @@ public final class DesktopApplicationCon
super.processWindowStateEvent(event);
switch (event.getID()) {
- case WindowEvent.WINDOW_ICONIFIED: {
+ case WindowEvent.WINDOW_ICONIFIED:
try {
application.suspend();
} catch (Throwable exception) {
handleUncaughtException(exception);
}
break;
- }
- case WindowEvent.WINDOW_DEICONIFIED: {
+ case WindowEvent.WINDOW_DEICONIFIED:
try {
application.resume();
} catch (Throwable exception) {
handleUncaughtException(exception);
}
break;
- }
- default: {
+ default:
break;
- }
}
}
}
@@ -331,9 +325,10 @@ public final class DesktopApplicationCon
public void processWindowEvent(WindowEvent event) {
super.processWindowEvent(event);
+ Display display;
switch (event.getID()) {
- case WindowEvent.WINDOW_OPENED: {
- Display display = this.displayHost.getDisplay();
+ case WindowEvent.WINDOW_OPENED:
+ display = this.displayHost.getDisplay();
displays.add(display);
if (this.displayCloseListener != null) {
@@ -341,26 +336,20 @@ public final class DesktopApplicationCon
}
this.displayHost.requestFocus();
-
break;
- }
- case WindowEvent.WINDOW_CLOSING: {
+ case WindowEvent.WINDOW_CLOSING:
dispose();
break;
- }
- case WindowEvent.WINDOW_CLOSED: {
- Display display = this.displayHost.getDisplay();
+ case WindowEvent.WINDOW_CLOSED:
+ display = this.displayHost.getDisplay();
displays.remove(display);
if (this.displayCloseListener != null) {
this.displayCloseListener.hostWindowClosed(display);
}
-
break;
- }
- default: {
+ default:
break;
- }
}
}
}
@@ -893,9 +882,12 @@ public final class DesktopApplicationCon
/**
* Utility method to make it easier to define <tt>main()</tt> entry-points
- * into applications. For example: <code> public class MyApp implements
- * Application { public static void main(String[] args) throws Exception {
- * DesktopApplicationContext.main(MyApp.class, args); } } </code>
+ * into applications. For example:
+ * <pre> public class MyApp implements Application {
+ * public static void main(String[] args) throws Exception {
+ * DesktopApplicationContext.main(MyApp.class, args);
+ * }
+ * } </pre>
*
* @param applicationClass the class of Application entry point
* @param applicationArgs application arguments