Changeset 12808 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-09-09T20:13:14+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r12804 r12808 6 6 7 7 import java.awt.BorderLayout; 8 import java.awt.Container; 8 9 import java.awt.Dimension; 9 10 import java.awt.GraphicsEnvironment; … … 932 933 !args.hasOption(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false)); 933 934 final MainFrame mainFrame = new MainFrame(geometry); 934 if (mainFrame.getContentPane() instanceof JComponent) { 935 contentPanePrivate = (JComponent) mainFrame.getContentPane(); 935 final Container contentPane = mainFrame.getContentPane(); 936 if (contentPane instanceof JComponent) { 937 contentPanePrivate = (JComponent) contentPane; 936 938 } 937 939 mainPanel = mainFrame.getPanel(); -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
r11948 r12808 621 621 while (splitChildren.hasNext()) { 622 622 Node splitChild = splitChildren.next(); 623 Divider dividerChild = 624 splitChildren.hasNext() ? (Divider) (splitChildren.next()) : null; 623 Divider dividerChild = null; 624 if (splitChildren.hasNext()) { 625 Node next = splitChildren.next(); 626 if (next instanceof Divider) { 627 dividerChild = (Divider) next; 628 } 629 } 625 630 626 631 double childWidth;
Note:
See TracChangeset
for help on using the changeset viewer.