[vassalengine-svn] SF.net SVN: vassalengine: [2465] VASSAL-src/branches/uckelman-merge/VASSAL
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2007-09-28 17:37:20
|
Revision: 2465 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=2465&view=rev Author: uckelman Date: 2007-09-28 10:37:24 -0700 (Fri, 28 Sep 2007) Log Message: ----------- Since Java 1.5, the methods add(), remove(), and setLayout() in JDialog and JFrame now forward to the contentPane, so getContentPane().add() etc. is no longer necessary. Modified Paths: -------------- VASSAL-src/branches/uckelman-merge/VASSAL/build/GameModule.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ChartWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Chatter.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Inventory.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ModuleExtension.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/MultiRoll.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/NotesWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/PieceWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/SpecialDiceButton.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/AboutScreen.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/HelpWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/gamepieceimage/StringEnumConfigurer.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/BoardPicker.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/ImageSaver.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SetupStack.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/Zoomer.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/GridEditor.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/RegionGrid.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/HexGridNumbering.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/PolygonEditor.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/Zone.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/noteswindow/SecretNotesController.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/ListTurnLevel.java VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/TurnTracker.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/Base64.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/PlayerInfoWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/jabber/JabberClient.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/messageboard/MessageBoardControls.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/DirectPeerPool.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/P2PClient.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ChatServerControls.java VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ShowServerStatusAction.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/ChooseComponentDialog.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigureTree.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigurerWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/CreateInstallerAction.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/FontConfigurer.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleEditWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleUpdaterDialog.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/PropertiesWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/SavedGameUpdaterDialog.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringArrayConfigurer.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringEnumConfigurer.java VASSAL-src/branches/uckelman-merge/VASSAL/configure/ValidationReportDialog.java VASSAL-src/branches/uckelman-merge/VASSAL/counters/Deck.java VASSAL-src/branches/uckelman-merge/VASSAL/counters/PieceDefiner.java VASSAL-src/branches/uckelman-merge/VASSAL/counters/PropertySheet.java VASSAL-src/branches/uckelman-merge/VASSAL/counters/TableInfo.java VASSAL-src/branches/uckelman-merge/VASSAL/i18n/TranslateWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/launch/ConsoleWindow.java VASSAL-src/branches/uckelman-merge/VASSAL/launch/ResourceExtracter.java VASSAL-src/branches/uckelman-merge/VASSAL/launch/install/WizardDialog.java VASSAL-src/branches/uckelman-merge/VASSAL/preferences/PrefsEditor.java VASSAL-src/branches/uckelman-merge/VASSAL/tools/ComponentSplitter.java VASSAL-src/branches/uckelman-merge/VASSAL/tools/GeneralFilter.java VASSAL-src/branches/uckelman-merge/VASSAL/tools/SplashScreen.java Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/GameModule.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/GameModule.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/GameModule.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -170,7 +170,7 @@ } }); - frame.getContentPane().setLayout(new BorderLayout()); + frame.setLayout(new BorderLayout()); frame.setJMenuBar(new JMenuBar()); fileMenu.setMnemonic('F'); @@ -179,13 +179,13 @@ toolBar.setLayout(new VASSAL.tools.WrapLayout(FlowLayout.LEFT, 0, 0)); toolBar.setAlignmentX(0.0F); toolBar.setFloatable(false); - frame.getContentPane().add(toolBar, BorderLayout.NORTH); + frame.add(toolBar, BorderLayout.NORTH); controlPanel.setLayout(new BorderLayout()); addKeyStrokeSource (new KeyStrokeSource (frame.getRootPane(), JComponent.WHEN_IN_FOCUSED_WINDOW)); - frame.getContentPane().add(controlPanel, BorderLayout.CENTER); + frame.add(controlPanel, BorderLayout.CENTER); validator = new CompoundValidityChecker (new MandatoryComponent(this, Documentation.class), Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ChartWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ChartWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ChartWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -89,7 +89,7 @@ frame = new JDialog(GameModule.getGameModule().getFrame()); GameModule.getGameModule().addKeyStrokeSource(new KeyStrokeSource(frame.getRootPane(), JComponent.WHEN_IN_FOCUSED_WINDOW)); while (root.getComponentCount() > 0) { - frame.getContentPane().add(root.getComponent(0)); + frame.add(root.getComponent(0)); } root = frame.getContentPane(); frame.setTitle(launch.getAttributeValueString(DEPRECATED_NAME)); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Chatter.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Chatter.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Chatter.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -364,7 +364,7 @@ public static void main(String[] args) { Chatter chat = new Chatter(); JFrame f = new JFrame(); - f.getContentPane().add(chat); + f.add(chat); f.pack(); f.setVisible(true); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Inventory.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Inventory.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/Inventory.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -214,9 +214,9 @@ frame.setTitle(getConfigureName()); String key = "Inventory." + getConfigureName(); //$NON-NLS-1$ GameModule.getGameModule().getPrefs().addOption(new PositionOption(key, frame)); - frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); - frame.getContentPane().add(initTree()); - frame.getContentPane().add(initButtons()); + frame.setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); + frame.add(initTree()); + frame.add(initButtons()); frame.setSize(250, 350); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ModuleExtension.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ModuleExtension.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/ModuleExtension.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -276,11 +276,11 @@ if (editAction == null) { d.setName(getName()); final StringConfigurer config = new StringConfigurer(VERSION, "Version: ", version); - d.getContentPane().setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); - d.getContentPane().add(config.getControls()); + d.setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); + d.add(config.getControls()); final BooleanConfigurer uconfig = new BooleanConfigurer(UNIVERSAL, "Allow loading with any module?", universal); - d.getContentPane().add(uconfig.getControls()); + d.add(uconfig.getControls()); Box b = Box.createHorizontalBox(); JButton ok = new JButton("Save"); @@ -299,7 +299,7 @@ } }); b.add(cancel); - d.getContentPane().add(b); + d.add(b); d.pack(); d.setLocationRelativeTo(d.getParent()); editAction = new AbstractAction() { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/MultiRoll.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/MultiRoll.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/MultiRoll.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -251,8 +251,8 @@ buttonPanel.add(canButton); buttonPanel.add(emailButton); - getContentPane().add(topPanel, BorderLayout.PAGE_START); - getContentPane().add(buttonPanel, BorderLayout.PAGE_END); + add(topPanel, BorderLayout.PAGE_START); + add(buttonPanel, BorderLayout.PAGE_END); pack(); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/NotesWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/NotesWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/NotesWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -138,7 +138,7 @@ } protected void initComponents() { - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { @@ -150,7 +150,7 @@ scenarioNotes = new TextConfigurer(null, null); publicNotes = new TextConfigurer(null, null); JTabbedPane tab = new JTabbedPane(); - getContentPane().add(tab); + add(tab); Box b = Box.createVerticalBox(); b.add(new JLabel(Resources.getString("Notes.visible_to_all"))); //$NON-NLS-1$ @@ -183,7 +183,7 @@ } }); p.add(cancelButton); - getContentPane().add(p); + add(p); } } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/PieceWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/PieceWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/PieceWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -84,7 +84,7 @@ private Window initFrame() { if (GlobalOptions.getInstance().isUseSingleWindow()) { final JDialog d = new JDialog(GameModule.getGameModule().getFrame()); - d.getContentPane().add(root); + d.add(root); d.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); d.setTitle(getConfigureName()); addPropertyChangeListener(new java.beans.PropertyChangeListener() { @@ -99,7 +99,7 @@ } else { final JFrame d = new JFrame(); - d.getContentPane().add(root); + d.add(root); d.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); d.setTitle(getConfigureName()); addPropertyChangeListener(new java.beans.PropertyChangeListener() { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/SpecialDiceButton.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/SpecialDiceButton.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/SpecialDiceButton.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -106,7 +106,7 @@ dialog = new JDialog(GameModule.getGameModule().getFrame()); dialogLabel = new JLabel(); dialogLabel.setIcon(resultsIcon); - dialog.getContentPane().add(dialogLabel); + dialog.add(dialogLabel); ActionListener rollAction = new ActionListener() { public void actionPerformed(ActionEvent e) { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/AboutScreen.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/AboutScreen.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/AboutScreen.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -86,20 +86,20 @@ ImageIcon icon = new ImageIcon(image); JWindow w = new JWindow(GameModule.getGameModule() != null ? GameModule.getGameModule().getFrame() : null); w.getContentPane().setBackground(Color.black); - w.getContentPane().setLayout(new BoxLayout(w.getContentPane(), BoxLayout.Y_AXIS)); + w.setLayout(new BoxLayout(w.getContentPane(), BoxLayout.Y_AXIS)); JLabel l = new JLabel(icon); l.setAlignmentX(0.5F); - w.getContentPane().add(l); - w.getContentPane().add(createLabel( + w.add(l); + w.add(createLabel( Resources.getString("AboutScreen.module_version", //$NON-NLS-1$ GameModule.getGameModule().getGameName(), GameModule.getGameModule().getGameVersion()))); for (ModuleExtension ext : GameModule.getGameModule().getComponentsOf(ModuleExtension.class)) { - w.getContentPane().add(createLabel( + w.add(createLabel( Resources.getString("AboutScreen.extension_version", ext.getName(), ext.getVersion()))); //$NON-NLS-1$ } - w.getContentPane().add(createLabel( + w.add(createLabel( Resources.getString("AboutScreen.vassal_version", Info.getVersion()))); //$NON-NLS-1$ w.pack(); Dimension d = Toolkit.getDefaultToolkit().getScreenSize(); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/HelpWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/HelpWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/documentation/HelpWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -57,7 +57,7 @@ pane.setEditorKit(myHTMLEditorKit); JScrollPane scroll = new ScrollPane(pane); - getContentPane().add(scroll); + add(scroll); update(contents); pack(); Dimension d = Toolkit.getDefaultToolkit().getScreenSize(); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/gamepieceimage/StringEnumConfigurer.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/gamepieceimage/StringEnumConfigurer.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/gamepieceimage/StringEnumConfigurer.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -125,7 +125,7 @@ System.err.println(evt.getPropertyName() + " = " + evt.getNewValue()); //$NON-NLS-1$ } }); - f.getContentPane().add(c.getControls()); + f.add(c.getControls()); f.pack(); f.setVisible(true); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/BoardPicker.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/BoardPicker.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/BoardPicker.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -363,7 +363,7 @@ buttons.add(cancel); b.add(controls); b.add(buttons); - d.getContentPane().add(b); + d.add(b); d.pack(); d.setLocationRelativeTo(c); d.setVisible(true); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/ImageSaver.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/ImageSaver.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/ImageSaver.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -159,7 +159,7 @@ text.setForeground(Color.black); text.setBorder(new BevelBorder(BevelBorder.RAISED, Color.lightGray, Color.darkGray)); w.getContentPane().setBackground(Color.white); - w.getContentPane().add(text); + w.add(text); w.pack(); Rectangle r = map.getView().getTopLevelAncestor().getBounds(); w.setLocation(r.x + r.width / 2 - w.getSize().width / 2, r.y + r.height / 2 - w.getSize().height / 2); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SetupStack.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SetupStack.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/SetupStack.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -432,7 +432,7 @@ scroll.setPreferredSize(DEFAULT_SIZE); - getContentPane().add(scroll, BorderLayout.CENTER); + add(scroll, BorderLayout.CENTER); Box textPanel = Box.createVerticalBox(); textPanel.add(new JLabel("Arrow Keys - Move Stack")); @@ -480,7 +480,7 @@ mainPanel.add(controlPanel); mainPanel.add(okPanel); - getContentPane().add(mainPanel, BorderLayout.SOUTH); + add(mainPanel, BorderLayout.SOUTH); board.fixImage(); scroll.revalidate(); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/Zoomer.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/Zoomer.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/Zoomer.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -80,7 +80,7 @@ l.setForeground(Color.black); l.setBorder(new BevelBorder( BevelBorder.RAISED, Color.lightGray, Color.darkGray)); - w.getContentPane().add(l); + w.add(l); w.pack(); Dimension d = Toolkit.getDefaultToolkit().getScreenSize(); w.setLocation(d.width/2-w.getSize().width/2, Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/GridEditor.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/GridEditor.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/GridEditor.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -116,7 +116,7 @@ JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); scroll.setPreferredSize(new Dimension(800, 600)); - getContentPane().add(scroll, BorderLayout.CENTER); + add(scroll, BorderLayout.CENTER); Box textPanel = Box.createVerticalBox(); textPanel.add(new JLabel("Arrow Keys - Move Grid")); @@ -180,7 +180,7 @@ controlPanel.add(textPanel); controlPanel.add(buttonPanel); - getContentPane().add(controlPanel, BorderLayout.SOUTH); + add(controlPanel, BorderLayout.SOUTH); board.fixImage(); scroll.revalidate(); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/RegionGrid.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/RegionGrid.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/RegionGrid.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -474,7 +474,7 @@ scroll.setPreferredSize(new Dimension(800, 600)); - getContentPane().add(scroll, BorderLayout.CENTER); + add(scroll, BorderLayout.CENTER); Box bottomPanel = Box.createVerticalBox(); JPanel buttonPanel = new JPanel(); @@ -500,7 +500,7 @@ bottomPanel.add(mess); bottomPanel.add(buttonPanel); - getContentPane().add(bottomPanel, BorderLayout.SOUTH); + add(bottomPanel, BorderLayout.SOUTH); board.fixImage(); scroll.revalidate(); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/HexGridNumbering.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/HexGridNumbering.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/HexGridNumbering.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -401,7 +401,7 @@ } } JFrame f = new JFrame(); - f.getContentPane().add(new TestPanel()); + f.add(new TestPanel()); Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); screenSize.height -= 100; screenSize.width -= 100; Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/PolygonEditor.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/PolygonEditor.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/PolygonEditor.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -273,7 +273,7 @@ public static void main(String[] args) { JFrame f = new JFrame(); - f.getContentPane().add(new PolygonEditor(null)); + f.add(new PolygonEditor(null)); f.setSize(500, 500); f.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/Zone.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/Zone.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/map/boardPicker/board/mapgrid/Zone.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -492,7 +492,7 @@ } }; frame = new JDialog((Frame) null, zone.getConfigureName(), true); - frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); + frame.setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); JPanel labels = new JPanel(); labels.setLayout(new GridLayout(2, 2)); labels.add(new JLabel("Drag to create initial shape")); @@ -500,7 +500,7 @@ labels.add(new JLabel("Left-click to move points")); labels.add(new JLabel("DEL to remove point")); labels.setAlignmentX(0.0f); - frame.getContentPane().add(labels); + frame.add(labels); JButton direct = new JButton("Set Coordinates directly"); direct.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -522,10 +522,10 @@ } }); direct.setAlignmentX(0.0f); - frame.getContentPane().add(direct); + frame.add(direct); scroll = new AdjustableSpeedScrollPane(editor); editor.setScroll(scroll); - frame.getContentPane().add(scroll); + frame.add(scroll); JPanel buttonPanel = new JPanel(); JButton closeButton = new JButton("Ok"); closeButton.addActionListener(new ActionListener() { @@ -536,7 +536,7 @@ } }); buttonPanel.add(closeButton); - frame.getContentPane().add(buttonPanel); + frame.add(buttonPanel); } private void init(Zone zone) { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/noteswindow/SecretNotesController.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/noteswindow/SecretNotesController.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/noteswindow/SecretNotesController.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -389,9 +389,9 @@ d.setTitle(Resources.getString("Notes.delayed_note")); //$NON-NLS-1$ final StringConfigurer name = new StringConfigurer(null, Resources.getString("Notes.name")); //$NON-NLS-1$ final TextConfigurer text = new TextConfigurer(null, Resources.getString("Notes.text")); //$NON-NLS-1$ - d.getContentPane().setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); - d.getContentPane().add(name.getControls()); - d.getContentPane().add(text.getControls()); + d.setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); + d.add(name.getControls()); + d.add(text.getControls()); Box buttonPanel = Box.createHorizontalBox(); final JButton okButton = new JButton(Resources.getString(Resources.OK)); okButton.addActionListener(new ActionListener() { @@ -425,7 +425,7 @@ d.dispose(); } }); - d.getContentPane().add(buttonPanel); + d.add(buttonPanel); d.pack(); d.setLocationRelativeTo(d.getOwner()); d.setVisible(true); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/ListTurnLevel.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/ListTurnLevel.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/ListTurnLevel.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -369,8 +369,7 @@ public ConfigDialog() { super(GameModule.getGameModule().getFrame(), Resources.getString("TurnTracker.configure2", getConfigureName())); //$NON-NLS-1$ - Container pane = getContentPane(); - pane.setLayout(new BoxLayout(pane, BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); if (configFirst) { if (prompt == null) { @@ -388,12 +387,12 @@ } } }); - pane.add(firstItem.getControls()); + add(firstItem.getControls()); } if (configList) { - - pane.add(new JLabel(Resources.getString("TurnTracker.turn_off"))); //$NON-NLS-1$ + + add(new JLabel(Resources.getString("TurnTracker.turn_off"))); //$NON-NLS-1$ for (int i = 0; i < list.length; i++) { BooleanConfigurer b = new BooleanConfigurer(null, list[i], new Boolean(active[i])); @@ -408,7 +407,7 @@ } } }); - pane.add(b.getControls()); + add(b.getControls()); } } @@ -432,9 +431,8 @@ }); p.add(cancelButton); - pane.add(p); + add(p); pack(); } - } } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/TurnTracker.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/TurnTracker.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/build/module/turn/TurnTracker.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -965,7 +965,7 @@ } protected void initComponents() { - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { @@ -976,7 +976,7 @@ panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); - getContentPane().add(panel); + add(panel); JPanel p = new JPanel(); @@ -1000,7 +1000,7 @@ }); p.add(cancelButton); - getContentPane().add(p); + add(p); } public void setControls(TurnTracker turn) { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/Base64.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/Base64.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/Base64.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -182,7 +182,7 @@ javax.swing.ImageIcon iicon = new javax.swing.ImageIcon( bytes ); javax.swing.JLabel jlabel = new javax.swing.JLabel( "Read from test.gif.b64", iicon,0 ); //$NON-NLS-1$ javax.swing.JFrame jframe = new javax.swing.JFrame(); - jframe.getContentPane().add( jlabel ); + jframe.add( jlabel ); jframe.pack(); jframe.setVisible(true); @@ -209,7 +209,7 @@ javax.swing.JScrollPane jsp = new javax.swing.JScrollPane( jta ); jframe = new javax.swing.JFrame(); jframe.setTitle( "Read from test.gif_out" ); //$NON-NLS-1$ - jframe.getContentPane().add( jsp ); + jframe.add( jsp ); jframe.pack(); jframe.setVisible(true); @@ -232,7 +232,7 @@ iicon = new javax.swing.ImageIcon( edbytes ); jlabel = new javax.swing.JLabel( "Read from test.gif.b64_out", iicon,0 ); //$NON-NLS-1$ jframe = new javax.swing.JFrame(); - jframe.getContentPane().add( jlabel ); + jframe.add( jlabel ); jframe.pack(); jframe.setVisible(true); } // end: Test Input Stream @@ -276,7 +276,7 @@ javax.swing.JScrollPane jsp = new javax.swing.JScrollPane( jta ); javax.swing.JFrame jframe = new javax.swing.JFrame(); jframe.setTitle( "Read from test.gif.b64_out2" ); //$NON-NLS-1$ - jframe.getContentPane().add( jsp ); + jframe.add( jsp ); jframe.pack(); jframe.setVisible(true); @@ -288,7 +288,7 @@ javax.swing.ImageIcon iicon = new javax.swing.ImageIcon( "test.gif_out2" ); //$NON-NLS-1$ javax.swing.JLabel jlabel = new javax.swing.JLabel( "Read from test.gif_out2", iicon,0 ); //$NON-NLS-1$ jframe = new javax.swing.JFrame(); - jframe.getContentPane().add( jlabel ); + jframe.add( jlabel ); jframe.pack(); jframe.setVisible(true); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/PlayerInfoWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/PlayerInfoWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/PlayerInfoWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -29,7 +29,7 @@ public PlayerInfoWindow(java.awt.Frame f, SimplePlayer p) { super(f, p.getName()); - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); Box b = Box.createHorizontalBox(); JTextField tf = new JTextField(p.getName().length()); tf.setText(p.getName()); @@ -38,23 +38,23 @@ tf.getPreferredSize().height)); b.add(new JLabel(Resources.getString("Chat.real_name"))); //$NON-NLS-1$ b.add(tf); - getContentPane().add(b); + add(b); JCheckBox box = new JCheckBox(Resources.getString("Chat.looking_for_a_game")); //$NON-NLS-1$ box.setSelected(((SimpleStatus)p.getStatus()).isLooking()); box.setEnabled(false); - getContentPane().add(box); + add(box); box = new JCheckBox(Resources.getString("Chat.away_from_keyboard")); //$NON-NLS-1$ box.setSelected(((SimpleStatus)p.getStatus()).isAway()); box.setEnabled(false); - getContentPane().add(box); + add(box); - getContentPane().add(new JLabel(Resources.getString("Chat.personal_info"))); //$NON-NLS-1$ + add(new JLabel(Resources.getString("Chat.personal_info"))); //$NON-NLS-1$ JTextArea ta = new JTextArea(); ta.setText(((SimpleStatus)p.getStatus()).getProfile()); ta.setEditable(false); - getContentPane().add(new JScrollPane(ta)); + add(new JScrollPane(ta)); pack(); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/jabber/JabberClient.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/jabber/JabberClient.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/jabber/JabberClient.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -673,7 +673,7 @@ ChatServerControls controls = new ChatServerControls(); controls.setClient(client); JFrame f = new JFrame(username); - f.getContentPane().add(controls.getControls()); + f.add(controls.getControls()); f.pack(); f.setVisible(true); f.addWindowListener(new WindowAdapter() { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/messageboard/MessageBoardControls.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/messageboard/MessageBoardControls.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/messageboard/MessageBoardControls.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -70,8 +70,8 @@ msgFrame = new JFrame(Resources.getString("Chat.message_board")); //$NON-NLS-1$ msgFrame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); - msgFrame.getContentPane().setLayout(new BoxLayout(msgFrame.getContentPane(), BoxLayout.Y_AXIS)); - msgFrame.getContentPane().add(viewer); + msgFrame.setLayout(new BoxLayout(msgFrame.getContentPane(), BoxLayout.Y_AXIS)); + msgFrame.add(viewer); Box box = Box.createHorizontalBox(); JButton b = new JButton(Resources.getString("Chat.refresh")); //$NON-NLS-1$ @@ -89,7 +89,7 @@ } }); box.add(b); - msgFrame.getContentPane().add(box); + msgFrame.add(box); msgComposer = new Comp(); @@ -142,7 +142,7 @@ private Comp() { super(Resources.getString("Chat.message_composer")); //$NON-NLS-1$ - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); final JTextArea msgArea = new JTextArea(15, 60); Box b = Box.createHorizontalBox(); @@ -165,8 +165,8 @@ b.add(okButton); b.add(cancelButton); - getContentPane().add(new JScrollPane(msgArea)); - getContentPane().add(b); + add(new JScrollPane(msgArea)); + add(b); pack(); setLocation(java.awt.Toolkit.getDefaultToolkit().getScreenSize().width / 2 - getSize().width / 2, 0); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/DirectPeerPool.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/DirectPeerPool.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/DirectPeerPool.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -110,16 +110,16 @@ } frame = new JDialog(owner,Resources.getString("Peer2Peer.direct_connection")); //$NON-NLS-1$ frame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); - frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); - frame.getContentPane().add(createLabel(Resources.getString("Peer2Peer.your_ip_address", myIp, String.valueOf(me.getInfo().getPort())))); //$NON-NLS-1$ - frame.getContentPane().add(createLabel(Resources.getString("Peer2Peer.other_players_address"))); //$NON-NLS-1$ + frame.setLayout(new BoxLayout(frame.getContentPane(), BoxLayout.Y_AXIS)); + frame.add(createLabel(Resources.getString("Peer2Peer.your_ip_address", myIp, String.valueOf(me.getInfo().getPort())))); //$NON-NLS-1$ + frame.add(createLabel(Resources.getString("Peer2Peer.other_players_address"))); //$NON-NLS-1$ Box b = Box.createHorizontalBox(); b.setAlignmentX(0.0f); JButton invite = new JButton(Resources.getString("Peer2Peer.invite")); //$NON-NLS-1$ b.add(invite); final JTextField tf = new JTextField(Resources.getString("Peer2Peer.address_port")); //$NON-NLS-1$ b.add(tf); - frame.getContentPane().add(b); + frame.add(b); ActionListener al = new ActionListener() { public void actionPerformed(ActionEvent e) { PeerInfo info = PeerInfo.deFormat(tf.getText()); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/P2PClient.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/P2PClient.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/peer2peer/P2PClient.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -315,9 +315,9 @@ } }); JFrame f = new JFrame(); - f.getContentPane().setLayout(new BorderLayout()); - f.getContentPane().add(w.getControls()); - f.getContentPane().add(tf,BorderLayout.SOUTH); + f.setLayout(new BorderLayout()); + f.add(w.getControls()); + f.add(tf,BorderLayout.SOUTH); f.pack(); f.setVisible(true); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ChatServerControls.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ChatServerControls.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ChatServerControls.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -166,7 +166,7 @@ else { JFrame frame = new JFrame(Resources.getString("Chat.server")); //$NON-NLS-1$ frame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); - frame.getContentPane().add(controlPanel); + frame.add(controlPanel); String key = "BoundsOfClientWindow"; //$NON-NLS-1$ PositionOption pos = new VisibilityOption(key, frame); GameModule.getGameModule().getPrefs().addOption(pos); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ShowServerStatusAction.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ShowServerStatusAction.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/chat/ui/ShowServerStatusAction.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -73,13 +73,13 @@ super(Resources.getString("Chat.server_status")); //$NON-NLS-1$ view = new ServerStatusView(status); view.addPropertyChangeListener(ServerStatusView.SELECTION_PROPERTY,this); - getContentPane().add(view); + add(view); messageMgr = new MessageBoardControls(); JToolBar toolbar = new JToolBar(); toolbar.setFloatable(false); toolbar.add(messageMgr.getCheckMessagesAction()); toolbar.add(messageMgr.getPostMessageAction()); - getContentPane().add(toolbar, BorderLayout.NORTH); + add(toolbar, BorderLayout.NORTH); pack(); setSize(Math.max(getSize().width,400),Math.max(getSize().height,300)); Dimension d = Toolkit.getDefaultToolkit().getScreenSize(); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/ChooseComponentDialog.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/ChooseComponentDialog.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/ChooseComponentDialog.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -49,7 +49,7 @@ super(owner, true); this.targetClass = targetClass; setDefaultCloseOperation(DISPOSE_ON_CLOSE); - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); tree = new VASSAL.configure.ConfigureTree(GameModule.getGameModule(), null) { private static final long serialVersionUID = 1L; @@ -58,7 +58,7 @@ } }; tree.addTreeSelectionListener(this); - getContentPane().add(new ScrollPane(tree)); + add(new ScrollPane(tree)); Box b = Box.createHorizontalBox(); okButton = new JButton("Ok"); okButton.setEnabled(false); @@ -76,7 +76,7 @@ }); b.add(okButton); b.add(cancelButton); - getContentPane().add(b); + add(b); pack(); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigureTree.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigureTree.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigureTree.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -252,7 +252,7 @@ public void actionPerformed(ActionEvent e) { final JDialog d = new JDialog((Frame) SwingUtilities.getAncestorOfClass(Frame.class, ConfigureTree.this), true); d.setTitle(target.getConfigureName() == null ? moveCmd : moveCmd + " " + target.getConfigureName()); - d.getContentPane().setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); + d.setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); Box box = Box.createHorizontalBox(); box.add(new JLabel("Move to position")); box.add(Box.createHorizontalStrut(10)); @@ -280,8 +280,8 @@ d.dispose(); } }); - d.getContentPane().add(box); - d.getContentPane().add(ok); + d.add(box); + d.add(ok); d.pack(); d.setLocationRelativeTo(d.getParent()); d.setVisible(true); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigurerWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigurerWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/ConfigurerWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -42,8 +42,8 @@ public ConfigurerWindow(final Configurer c, boolean modal) { super((JFrame) null, modal); setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); - getContentPane().add(c.getControls()); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + add(c.getControls()); c.addPropertyChangeListener (new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -60,7 +60,7 @@ dispose(); } }); - getContentPane().add(okButton); + add(okButton); pack(); } } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/CreateInstallerAction.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/CreateInstallerAction.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/CreateInstallerAction.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -102,16 +102,16 @@ public void actionPerformed(ActionEvent e) { final JDialog d = new JDialog(parent, Resources.getString("Install.create_installer"), true); //$NON-NLS-1$ - d.getContentPane().setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); + d.setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); final StringEnumConfigurer heapSizeConfigurer = new StringEnumConfigurer(null, "Memory Allocation", HEAP_SIZES_PLAIN_TEXT); //$NON-NLS-1$ heapSizeConfigurer.setValue(HEAP_SIZES_PLAIN_TEXT[0]); - d.getContentPane().add(heapSizeConfigurer.getControls()); + d.add(heapSizeConfigurer.getControls()); final JButton ok = new JButton(Resources.getString("General.create")); //$NON-NLS-1$ JButton cancel = new JButton(Resources.getString("General.cancel")); //$NON-NLS-1$ Box b = Box.createHorizontalBox(); b.add(ok); b.add(cancel); - d.getContentPane().add(b); + d.add(b); d.pack(); d.setLocationRelativeTo(parent); cancel.addActionListener(new ActionListener() { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/FontConfigurer.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/FontConfigurer.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/FontConfigurer.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -108,12 +108,12 @@ public static void main(String args[]) { final JFrame f = new JFrame(); - f.getContentPane().setLayout(new BoxLayout(f.getContentPane(), BoxLayout.Y_AXIS)); + f.setLayout(new BoxLayout(f.getContentPane(), BoxLayout.Y_AXIS)); FontConfigurer c = new FontConfigurer("a", "Font: ", null, new int[]{4, 5, 6, 13}); - f.getContentPane().add(c.getControls()); + f.add(c.getControls()); final JTextArea tf = new JTextArea(); tf.setText("The quick brown fox jumps over the lazy dog."); - f.getContentPane().add(new ScrollPane(tf)); + f.add(new ScrollPane(tf)); c.addPropertyChangeListener(new java.beans.PropertyChangeListener() { public void propertyChange(java.beans.PropertyChangeEvent evt) { Font font = (Font) evt.getNewValue(); @@ -127,6 +127,5 @@ f.pack(); f.setVisible(true); } - } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleEditWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleEditWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleEditWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -73,7 +73,7 @@ } protected void initComponents(Component view) { - getContentPane().add(view); + add(view); toolbar = new JToolBar(); toolbar.setFloatable(false); SaveAction saveAction = new SaveAction() { @@ -103,7 +103,7 @@ catch (MalformedURLException e) { e.printStackTrace(); } - getContentPane().add(toolbar, BorderLayout.NORTH); + add(toolbar, BorderLayout.NORTH); JMenuBar mb = new JMenuBar(); JMenuItem mi; JMenu fileMenu = new JMenu(Resources.getString(Resources.FILE)); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleUpdaterDialog.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleUpdaterDialog.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/ModuleUpdaterDialog.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -43,9 +43,9 @@ public ModuleUpdaterDialog(Frame owner) throws HeadlessException { super(owner, false); setTitle("Module Updater"); - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); final FileConfigurer fileConfig = new FileConfigurer(null, "File containing older version: "); - getContentPane().add(fileConfig.getControls()); + add(fileConfig.getControls()); Box b = Box.createHorizontalBox(); final JButton saveButton = new JButton("Create Updater"); saveButton.setEnabled(false); @@ -85,7 +85,7 @@ } }); JButton helpButton = new JButton("Help"); - getContentPane().add(b); + add(b); HelpFile hf = null; try { hf = new HelpFile(null, new File(new File(VASSAL.build.module.Documentation.getDocumentationBaseDir(), "ReferenceManual"), "ModuleUpdater.htm")); @@ -97,7 +97,7 @@ b.add(saveButton); b.add(helpButton); b.add(cancelButton); - getContentPane().add(b); + add(b); pack(); setLocationRelativeTo(getOwner()); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/PropertiesWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/PropertiesWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/PropertiesWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -71,7 +71,7 @@ } child = nextChild; } - getContentPane().setLayout(new BoxLayout(getContentPane(),BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(),BoxLayout.Y_AXIS)); configurer = target.getConfigurer(); target.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -80,7 +80,7 @@ } } }); - getContentPane().add(configurer.getControls()); + add(configurer.getControls()); setTitle(VASSAL.configure.ConfigureTree.getConfigureName(target)); Box buttonBox = Box.createHorizontalBox(); JButton okButton = new JButton("Ok"); @@ -105,7 +105,7 @@ pack(); } - getContentPane().add(buttonBox); + add(buttonBox); pack(); setLocationRelativeTo(getParent()); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/SavedGameUpdaterDialog.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/SavedGameUpdaterDialog.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/SavedGameUpdaterDialog.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -69,7 +69,7 @@ } private void initComponents() { - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); Box versionBox = Box.createHorizontalBox(); versionBox.add(new JLabel("Module version of saved games: ")); versionField = new JTextField(8); @@ -83,7 +83,7 @@ } }); versionBox.add(importButton); - getContentPane().add(versionBox); + add(versionBox); JButton exportButton = new JButton("Export GamePiece info"); exportButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -93,7 +93,7 @@ Box importExportBox = Box.createHorizontalBox(); importExportBox.add(importButton); importExportBox.add(exportButton); - getContentPane().add(importExportBox); + add(importExportBox); Box savedGamesBox = Box.createHorizontalBox(); Box left = Box.createVerticalBox(); @@ -124,7 +124,7 @@ } }); savedGamesBox.add(new ScrollPane(savedGamesList)); - getContentPane().add(savedGamesBox); + add(savedGamesBox); Box buttonsBox = Box.createHorizontalBox(); updateButton = new JButton("Update games"); @@ -151,7 +151,7 @@ } }); buttonsBox.add(closeButton); - getContentPane().add(buttonsBox); + add(buttonsBox); pack(); setLocationRelativeTo(getOwner()); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringArrayConfigurer.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringArrayConfigurer.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringArrayConfigurer.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -246,7 +246,7 @@ } }); c.setValue("Rack,Shack,Benny"); - f.getContentPane().add(c.getControls()); + f.add(c.getControls()); f.pack(); f.setVisible(true); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringEnumConfigurer.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringEnumConfigurer.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/StringEnumConfigurer.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -122,7 +122,7 @@ System.err.println(evt.getPropertyName() + " = " + evt.getNewValue()); } }); - f.getContentPane().add(c.getControls()); + f.add(c.getControls()); f.pack(); f.setVisible(true); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/configure/ValidationReportDialog.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/configure/ValidationReportDialog.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/configure/ValidationReportDialog.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -44,9 +44,9 @@ setTitle("Problems found in module"); this.callback = cb; Box reportBox = Box.createVerticalBox(); - getContentPane().add(reportBox); + add(reportBox); JPanel buttonPanel = new JPanel(); - getContentPane().add(buttonPanel, BorderLayout.SOUTH); + add(buttonPanel, BorderLayout.SOUTH); List warnings = report.getWarnings(); switch (warnings.size()) { case 0: Modified: VASSAL-src/branches/uckelman-merge/VASSAL/counters/Deck.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/counters/Deck.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/counters/Deck.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -1016,7 +1016,7 @@ protected void promptForNextDraw() { final JDialog d = new JDialog((Frame) SwingUtilities.getAncestorOfClass(Frame.class, map.getView()), true); d.setTitle(Resources.getString("Deck.draw")); //$NON-NLS-1$ - d.getContentPane().setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); + d.setLayout(new BoxLayout(d.getContentPane(), BoxLayout.Y_AXIS)); class AvailablePiece implements Comparable { private GamePiece piece; @@ -1066,9 +1066,9 @@ } final JList list = new JList(pieces); list.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - d.getContentPane().add(new ScrollPane(list)); - d.getContentPane().add(new JLabel(Resources.getString("Deck.select_cards"))); //$NON-NLS-1$ - d.getContentPane().add(new JLabel(Resources.getString("Deck.then_click"))); //$NON-NLS-1$ + d.add(new ScrollPane(list)); + d.add(new JLabel(Resources.getString("Deck.select_cards"))); //$NON-NLS-1$ + d.add(new JLabel(Resources.getString("Deck.then_click"))); //$NON-NLS-1$ Box box = Box.createHorizontalBox(); JButton b = new JButton(Resources.getString(Resources.OK)); b.addActionListener(new ActionListener() { @@ -1094,7 +1094,7 @@ } }); box.add(b); - d.getContentPane().add(box); + d.add(box); d.pack(); d.setLocationRelativeTo(d.getOwner()); d.setVisible(true); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/counters/PieceDefiner.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/counters/PieceDefiner.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/counters/PieceDefiner.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -534,8 +534,8 @@ private void initialize(final EditablePiece p) { ed = p.getEditor(); - getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); - getContentPane().add(ed.getControls()); + setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS)); + add(ed.getControls()); JButton b = new JButton("Ok"); b.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { @@ -552,7 +552,7 @@ } }); panel.add(b); - getContentPane().add(panel); + add(panel); pack(); setLocationRelativeTo(getOwner()); } Modified: VASSAL-src/branches/uckelman-merge/VASSAL/counters/PropertySheet.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/counters/PropertySheet.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/counters/PropertySheet.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -349,7 +349,7 @@ JScrollPane scroll = new JScrollPane(pane, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); - frame.getContentPane().add(scroll); + frame.add(scroll); // set up Apply button if (commitStyle == COMMIT_ON_APPLY) { Modified: VASSAL-src/branches/uckelman-merge/VASSAL/counters/TableInfo.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/counters/TableInfo.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/counters/TableInfo.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -160,7 +160,7 @@ table.setTableHeader(null); JScrollPane scroll = new ScrollPane(table); scroll.getViewport().setPreferredSize(table.getPreferredSize()); - frame.getContentPane().add(scroll); + frame.add(scroll); Point p = GameModule.getGameModule().getFrame().getLocation(); if (getMap() != null) { p = getMap().getView().getLocationOnScreen(); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/i18n/TranslateWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/i18n/TranslateWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/i18n/TranslateWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -111,7 +111,7 @@ mainPanel.add(getHeaderPanel(), BorderLayout.PAGE_START); mainPanel.add(buildMainPanel(), BorderLayout.CENTER); mainPanel.add(getButtonPanel(), BorderLayout.PAGE_END); - getContentPane().add(mainPanel); + add(mainPanel); pack(); setLocationRelativeTo(getParent()); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); Modified: VASSAL-src/branches/uckelman-merge/VASSAL/launch/ConsoleWindow.java =================================================================== --- VASSAL-src/branches/uckelman-merge/VASSAL/launch/ConsoleWindow.java 2007-09-28 13:00:57 UTC (rev 2464) +++ VASSAL-src/branches/uckelman-merge/VASSAL/launch/ConsoleWindow.java 2007-09-28 17:37:24 UTC (rev 2465) @@ -39,10 +39,10 @@ protected void initComponents() { frame = new JFrame("VASSAL"); - frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(),BoxLayout.Y_AXIS)); + frame.setLayout(new BoxLayout(frame.getContentPane(),BoxLayout.Y_AXIS)); JLabel label = new JLabel(new ImageIcon(Toolkit.getDefaultToolkit().getImage(Consol... [truncated message content] |