diff --git a/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java b/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java index 64af243..53a8602 100644 --- a/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java +++ b/src/demo/share/jfc/FileChooserDemo/FileChooserDemo.java @@ -158,7 +158,7 @@ for (UIManager.LookAndFeelInfo lafInfo : installedLafs) { try { Class lnfClass = Class.forName(lafInfo.getClassName()); - LookAndFeel laf = (LookAndFeel) (lnfClass.newInstance()); + LookAndFeel laf = (LookAndFeel) (lnfClass.getDeclaredConstructor().newInstance()); if (laf.isSupportedLookAndFeel()) { String name = lafInfo.getName(); SupportedLaF supportedLaF = new SupportedLaF(name, laf); diff --git a/src/demo/share/jfc/Font2DTest/Font2DTest.java b/src/demo/share/jfc/Font2DTest/Font2DTest.java index de3b1ae..0fb8251 100644 --- a/src/demo/share/jfc/Font2DTest/Font2DTest.java +++ b/src/demo/share/jfc/Font2DTest/Font2DTest.java @@ -358,7 +358,7 @@ userTextDialog.pack(); userTextDialog.addWindowListener( new WindowAdapter() { public void windowClosing( WindowEvent e ) { - userTextDialog.hide(); + userTextDialog.setVisible(false); } }); @@ -384,7 +384,7 @@ printDialog.setResizable( false ); printDialog.addWindowListener( new WindowAdapter() { public void windowClosing( WindowEvent e ) { - printDialog.hide(); + printDialog.setVisible(false); } }); printDialog.getContentPane().setLayout( new GridLayout( printModeCBs.length + 2, 1 )); @@ -401,7 +401,7 @@ fontInfoDialog.setResizable( false ); fontInfoDialog.addWindowListener( new WindowAdapter() { public void windowClosing( WindowEvent e ) { - fontInfoDialog.hide(); + fontInfoDialog.setVisible(false); showFontInfoCBMI.setState( false ); } }); @@ -672,9 +672,9 @@ /// Set the visibility of User Text dialog if ( selectedText == fp.USER_TEXT ) - userTextDialog.show(); + userTextDialog.setVisible(true); else - userTextDialog.hide(); + userTextDialog.setVisible(false); /// Change the visibility/status/availability of Print JDialog buttons printModeCBs[ fp.ONE_PAGE ].setSelected( true ); if ( selectedText == fp.FILE_TEXT || selectedText == fp.USER_TEXT ) { @@ -792,10 +792,10 @@ lcdContrast, userTextOpt ); if ( showFontInfoOpt ) { fireUpdateFontInfo(); - fontInfoDialog.show(); + fontInfoDialog.setVisible(true); } else - fontInfoDialog.hide(); + fontInfoDialog.setVisible(false); } catch ( Exception ex ) { fireChangeStatus( "ERROR: Failed to Load Options File; See Stack Trace", true ); @@ -818,7 +818,7 @@ } }); f.pack(); - f.show(); + f.setVisible(true); } catch ( Exception ex ) { fireChangeStatus( "ERROR: Failed to Load PNG File; See Stack Trace", true ); @@ -860,7 +860,7 @@ else if ( itemName.equals( "Page Setup..." )) fp.doPageSetup(); else if ( itemName.equals( "Print..." )) - printDialog.show(); + printDialog.setVisible(true); else if ( itemName.equals( "Close" )) parent.dispose(); else if ( itemName.equals( "Exit" )) @@ -892,12 +892,12 @@ if ( itemName.equals( "Print" )) { for ( int i = 0; i < printModeCBs.length; i++ ) if ( printModeCBs[i].isSelected() ) { - printDialog.hide(); + printDialog.setVisible(false); fp.doPrint( i ); } } else if ( itemName.equals( "Cancel" )) - printDialog.hide(); + printDialog.setVisible(false); /// Update button from Usert Text JDialog... else if ( itemName.equals( "Update" )) fp.setTextToDraw( fp.USER_TEXT, null, @@ -995,10 +995,10 @@ else if ( cbmi == showFontInfoCBMI ) { if ( showFontInfoCBMI.getState() ) { fireUpdateFontInfo(); - fontInfoDialog.show(); + fontInfoDialog.setVisible(true); } else - fontInfoDialog.hide(); + fontInfoDialog.setVisible(false); } } } @@ -1038,7 +1038,7 @@ f.getContentPane().add( f2dt ); f.pack(); - f.show(); + f.setVisible(true); } /// Inner class definitions... diff --git a/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java b/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java index 1292a83..40678fd 100644 --- a/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java +++ b/src/demo/share/jfc/Font2DTest/Font2DTestApplet.java @@ -86,6 +86,6 @@ f.getContentPane().add( f2dt ); f.pack(); - f.show(); + f.setVisible(true); } } diff --git a/src/demo/share/jfc/Font2DTest/FontPanel.java b/src/demo/share/jfc/Font2DTest/FontPanel.java index d98ccd5..0e95d0e 100644 --- a/src/demo/share/jfc/Font2DTest/FontPanel.java +++ b/src/demo/share/jfc/Font2DTest/FontPanel.java @@ -392,7 +392,7 @@ setTransformG2( g2transform ); // ABP setDrawMethod( method ); setRenderingHints(AAValues.getValue(aa), FMValues.getValue(fm), - new Integer(contrast)); + Integer.valueOf(contrast)); } /// Writes the current screen to PNG file @@ -1137,7 +1137,7 @@ zoomAreaWidth / 2, (int) ( maxAscent * ZOOM )); g2.dispose(); if ( !nowZooming ) - zoomWindow.show(); + zoomWindow.setVisible(true); /// This is sort of redundant... since there is a paint function /// inside zoomWindow definition that does the drawImage. /// (I should be able to call just repaint() here) @@ -1176,7 +1176,7 @@ public void mouseReleased( MouseEvent e ) { if ( textToUse == RANGE_TEXT || textToUse == ALL_GLYPHS ) { if ( nowZooming ) - zoomWindow.hide(); + zoomWindow.setVisible(false); nowZooming = false; } this.setCursor( Cursor.getDefaultCursor() ); diff --git a/src/demo/share/jfc/Font2DTest/RangeMenu.java b/src/demo/share/jfc/Font2DTest/RangeMenu.java index 9200fb8..3e79653 100644 --- a/src/demo/share/jfc/Font2DTest/RangeMenu.java +++ b/src/demo/share/jfc/Font2DTest/RangeMenu.java @@ -186,7 +186,7 @@ if ( rangeName.equals("Custom...") ) { useCustomRange = true; customRangeDialog.setLocationRelativeTo(parent); - customRangeDialog.show(); + customRangeDialog.setVisible(true); } else { useCustomRange = false; @@ -195,7 +195,7 @@ } else if ( source instanceof JButton ) { /// Since it is only "OK" button that sends any action here... - customRangeDialog.hide(); + customRangeDialog.setVisible(false); } } diff --git a/src/demo/share/jfc/J2Ddemo/java2d/DemoPanel.java b/src/demo/share/jfc/J2Ddemo/java2d/DemoPanel.java index 5da5cc8..40fa0cc 100644 --- a/src/demo/share/jfc/J2Ddemo/java2d/DemoPanel.java +++ b/src/demo/share/jfc/J2Ddemo/java2d/DemoPanel.java @@ -64,7 +64,7 @@ try { if (obj instanceof String) { className = (String) obj; - obj = Class.forName(className).newInstance(); + obj = Class.forName(className).getDeclaredConstructor().newInstance(); } if (obj instanceof Component) { add((Component) obj); diff --git a/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Tree.java b/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Tree.java index e60ac76..48dccf2 100644 --- a/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Tree.java +++ b/src/demo/share/jfc/J2Ddemo/java2d/demos/Fonts/Tree.java @@ -51,8 +51,8 @@ public class Tree extends AnimatingSurface { private char theC = 'A'; - private Character theT = new Character(theC); - private Character theR = new Character((char) (theC + 1)); + private Character theT = Character.valueOf(theC); + private Character theR = Character.valueOf((char) (theC + 1)); public Tree() { setBackground(WHITE); @@ -65,9 +65,9 @@ @Override public void step(int w, int h) { setSleepAmount(4000); - theT = new Character(theC = ((char) (theC + 1))); - theR = new Character((char) (theC + 1)); - if (theR.compareTo(new Character('z')) == 0) { + theT = Character.valueOf(theC = ((char) (theC + 1))); + theR = Character.valueOf((char) (theC + 1)); + if (theR.compareTo(Character.valueOf('z')) == 0) { theC = 'A'; } } diff --git a/src/demo/share/jfc/SwingSet2/ColorChooserDemo.java b/src/demo/share/jfc/SwingSet2/ColorChooserDemo.java index 2a4b731..d87c108 100644 --- a/src/demo/share/jfc/SwingSet2/ColorChooserDemo.java +++ b/src/demo/share/jfc/SwingSet2/ColorChooserDemo.java @@ -128,7 +128,7 @@ okListener, null); - dialog.show(); + dialog.setVisible(true); if(e.getSource() == outerColorButton) { bezAnim.setOuterColor(chosen); diff --git a/src/demo/share/jfc/SwingSet2/DemoModule.java b/src/demo/share/jfc/SwingSet2/DemoModule.java index 8fb6042..a080f58 100644 --- a/src/demo/share/jfc/SwingSet2/DemoModule.java +++ b/src/demo/share/jfc/SwingSet2/DemoModule.java @@ -190,7 +190,7 @@ frame.getContentPane().add(getDemoPanel(), BorderLayout.CENTER); getDemoPanel().setPreferredSize(new Dimension(PREFERRED_WIDTH, PREFERRED_HEIGHT)); frame.pack(); - frame.show(); + frame.setVisible(true); } public JPanel createHorizontalPanel(boolean threeD) { diff --git a/src/demo/share/jfc/SwingSet2/DirectionPanel.java b/src/demo/share/jfc/SwingSet2/DirectionPanel.java index 9a18f64..4906590 100644 --- a/src/demo/share/jfc/SwingSet2/DirectionPanel.java +++ b/src/demo/share/jfc/SwingSet2/DirectionPanel.java @@ -147,10 +147,7 @@ getAccessibleContext().setAccessibleName(direction); getAccessibleContext().setAccessibleDescription(description); setSelected(selected); - } - - public boolean isFocusTraversable() { - return false; + setFocusable(false); } public void setBorder(Border b) { diff --git a/src/demo/share/jfc/SwingSet2/FileChooserDemo.java b/src/demo/share/jfc/SwingSet2/FileChooserDemo.java index 297e5cb..f851000 100644 --- a/src/demo/share/jfc/SwingSet2/FileChooserDemo.java +++ b/src/demo/share/jfc/SwingSet2/FileChooserDemo.java @@ -273,7 +273,7 @@ dialog.getContentPane().add(custom, BorderLayout.CENTER); dialog.pack(); dialog.setLocationRelativeTo(getDemoPanel()); - dialog.show(); + dialog.setVisible(true); } }; return createButton(a); diff --git a/src/demo/share/jfc/SwingSet2/InternalFrameDemo.java b/src/demo/share/jfc/SwingSet2/InternalFrameDemo.java index b9c5959..a02ec0b 100644 --- a/src/demo/share/jfc/SwingSet2/InternalFrameDemo.java +++ b/src/demo/share/jfc/SwingSet2/InternalFrameDemo.java @@ -59,9 +59,9 @@ ImageIcon icon1, icon2, icon3, icon4; ImageIcon smIcon1, smIcon2, smIcon3, smIcon4; - public Integer FIRST_FRAME_LAYER = new Integer(1); - public Integer DEMO_FRAME_LAYER = new Integer(2); - public Integer PALETTE_LAYER = new Integer(3); + public Integer FIRST_FRAME_LAYER = Integer.valueOf(1); + public Integer DEMO_FRAME_LAYER = Integer.valueOf(2); + public Integer PALETTE_LAYER = Integer.valueOf(3); public int FRAME0_X = 15; public int FRAME0_Y = 280; diff --git a/src/demo/share/jfc/SwingSet2/SliderDemo.java b/src/demo/share/jfc/SwingSet2/SliderDemo.java index 15bd7c4..989fdaf 100644 --- a/src/demo/share/jfc/SwingSet2/SliderDemo.java +++ b/src/demo/share/jfc/SwingSet2/SliderDemo.java @@ -166,7 +166,7 @@ @SuppressWarnings("unchecked") Dictionary labelTable = s.getLabelTable(); - labelTable.put(new Integer(11), new JLabel(new Integer(11).toString(), JLabel.CENTER)); + labelTable.put(Integer.valueOf(11), new JLabel(Integer.valueOf(11).toString(), JLabel.CENTER)); s.setLabelTable( s.getLabelTable() ); s.getAccessibleContext().setAccessibleName(getString("SliderDemo.minorticks")); diff --git a/src/demo/share/jfc/SwingSet2/SplitPaneDemo.java b/src/demo/share/jfc/SwingSet2/SplitPaneDemo.java index 9e92211..fba1a76 100644 --- a/src/demo/share/jfc/SwingSet2/SplitPaneDemo.java +++ b/src/demo/share/jfc/SwingSet2/SplitPaneDemo.java @@ -165,7 +165,7 @@ JLabel label; divSize = new JTextField(); - divSize.setText(new Integer(splitPane.getDividerSize()).toString()); + divSize.setText(Integer.valueOf(splitPane.getDividerSize()).toString()); divSize.setColumns(5); divSize.getAccessibleContext().setAccessibleName(getString("SplitPaneDemo.divider_size")); divSize.addActionListener(new ActionListener() { diff --git a/src/demo/share/jfc/SwingSet2/SwingSet2.java b/src/demo/share/jfc/SwingSet2/SwingSet2.java index 6a710b1..f553a7e 100644 --- a/src/demo/share/jfc/SwingSet2/SwingSet2.java +++ b/src/demo/share/jfc/SwingSet2/SwingSet2.java @@ -578,7 +578,7 @@ // register key binding to activate popup menu InputMap map = getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - map.put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, InputEvent.SHIFT_MASK), + map.put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, InputEvent.SHIFT_DOWN_MASK), "postMenuAction"); map.put(KeyStroke.getKeyStroke(KeyEvent.VK_CONTEXT_MENU, 0), "postMenuAction"); getActionMap().put("postMenuAction", new ActivatePopupMenuAction(this, popup)); @@ -686,7 +686,7 @@ screenInsets.top : centerHeight; f.setLocation(centerWidth, centerHeight); - f.show(); + f.setVisible(true); numSSs++; swingSets.add(this); } @@ -1213,7 +1213,7 @@ } else { aboutBox.setLocationRelativeTo(getFrame()); } - aboutBox.show(); + aboutBox.setVisible(true); } } diff --git a/src/demo/share/jfc/SwingSet2/TableDemo.java b/src/demo/share/jfc/SwingSet2/TableDemo.java index 130c4aa..48199c5 100644 --- a/src/demo/share/jfc/SwingSet2/TableDemo.java +++ b/src/demo/share/jfc/SwingSet2/TableDemo.java @@ -492,55 +492,55 @@ // Create the dummy data (a few rows of names) final Object[][] data = { - {"Mike", "Albers", green, getString("TableDemo.brazil"), new Double(44.0), strawberry}, - {"Mark", "Andrews", blue, getString("TableDemo.curse"), new Double(3), grapes}, - {"Brian", "Beck", black, getString("TableDemo.bluesbros"), new Double(2.7182818285), raspberry}, - {"Lara", "Bunni", red, getString("TableDemo.airplane"), new Double(15), strawberry}, - {"Roger", "Brinkley", blue, getString("TableDemo.man"), new Double(13), peach}, - {"Brent", "Christian", black, getString("TableDemo.bladerunner"), new Double(23), broccoli}, - {"Mark", "Davidson", darkgreen, getString("TableDemo.brazil"), new Double(27), asparagus}, - {"Jeff", "Dinkins", blue, getString("TableDemo.ladyvanishes"), new Double(8), kiwi}, - {"Ewan", "Dinkins", yellow, getString("TableDemo.bugs"), new Double(2), strawberry}, - {"Amy", "Fowler", violet, getString("TableDemo.reservoir"), new Double(3), raspberry}, - {"Hania", "Gajewska", purple, getString("TableDemo.jules"), new Double(5), raspberry}, - {"David", "Geary", blue, getString("TableDemo.pulpfiction"), new Double(3), watermelon}, -// {"James", "Gosling", pink, getString("TableDemo.tennis"), new Double(21), donut}, - {"Eric", "Hawkes", blue, getString("TableDemo.bladerunner"), new Double(.693), pickle}, - {"Shannon", "Hickey", green, getString("TableDemo.shawshank"), new Double(2), grapes}, - {"Earl", "Johnson", green, getString("TableDemo.pulpfiction"), new Double(8), carrot}, - {"Robi", "Khan", green, getString("TableDemo.goodfellas"), new Double(89), apple}, - {"Robert", "Kim", blue, getString("TableDemo.mohicans"), new Double(655321), strawberry}, - {"Janet", "Koenig", turquoise, getString("TableDemo.lonestar"), new Double(7), peach}, - {"Jeff", "Kesselman", blue, getString("TableDemo.stuntman"), new Double(17), pineapple}, - {"Onno", "Kluyt", orange, getString("TableDemo.oncewest"), new Double(8), broccoli}, - {"Peter", "Korn", sunpurple, getString("TableDemo.musicman"), new Double(12), sparegrass}, + {"Mike", "Albers", green, getString("TableDemo.brazil"), Double.valueOf(44.0), strawberry}, + {"Mark", "Andrews", blue, getString("TableDemo.curse"), Double.valueOf(3), grapes}, + {"Brian", "Beck", black, getString("TableDemo.bluesbros"), Double.valueOf(2.7182818285), raspberry}, + {"Lara", "Bunni", red, getString("TableDemo.airplane"), Double.valueOf(15), strawberry}, + {"Roger", "Brinkley", blue, getString("TableDemo.man"), Double.valueOf(13), peach}, + {"Brent", "Christian", black, getString("TableDemo.bladerunner"), Double.valueOf(23), broccoli}, + {"Mark", "Davidson", darkgreen, getString("TableDemo.brazil"), Double.valueOf(27), asparagus}, + {"Jeff", "Dinkins", blue, getString("TableDemo.ladyvanishes"), Double.valueOf(8), kiwi}, + {"Ewan", "Dinkins", yellow, getString("TableDemo.bugs"), Double.valueOf(2), strawberry}, + {"Amy", "Fowler", violet, getString("TableDemo.reservoir"), Double.valueOf(3), raspberry}, + {"Hania", "Gajewska", purple, getString("TableDemo.jules"), Double.valueOf(5), raspberry}, + {"David", "Geary", blue, getString("TableDemo.pulpfiction"), Double.valueOf(3), watermelon}, +// {"James", "Gosling", pink, getString("TableDemo.tennis"), Double.valueOf(21), donut}, + {"Eric", "Hawkes", blue, getString("TableDemo.bladerunner"), Double.valueOf(.693), pickle}, + {"Shannon", "Hickey", green, getString("TableDemo.shawshank"), Double.valueOf(2), grapes}, + {"Earl", "Johnson", green, getString("TableDemo.pulpfiction"), Double.valueOf(8), carrot}, + {"Robi", "Khan", green, getString("TableDemo.goodfellas"), Double.valueOf(89), apple}, + {"Robert", "Kim", blue, getString("TableDemo.mohicans"), Double.valueOf(655321), strawberry}, + {"Janet", "Koenig", turquoise, getString("TableDemo.lonestar"), Double.valueOf(7), peach}, + {"Jeff", "Kesselman", blue, getString("TableDemo.stuntman"), Double.valueOf(17), pineapple}, + {"Onno", "Kluyt", orange, getString("TableDemo.oncewest"), Double.valueOf(8), broccoli}, + {"Peter", "Korn", sunpurple, getString("TableDemo.musicman"), Double.valueOf(12), sparegrass}, - {"Rick", "Levenson", black, getString("TableDemo.harold"), new Double(1327), raspberry}, - {"Brian", "Lichtenwalter", jfcblue, getString("TableDemo.fifthelement"), new Double(22), pear}, - {"Malini", "Minasandram", beige, getString("TableDemo.joyluck"), new Double(9), corn}, - {"Michael", "Martak", green, getString("TableDemo.city"), new Double(3), strawberry}, - {"David", "Mendenhall", forestgreen, getString("TableDemo.schindlerslist"), new Double(7), peach}, - {"Phil", "Milne", suspectpink, getString("TableDemo.withnail"), new Double(3), banana}, - {"Lynn", "Monsanto", cybergreen, getString("TableDemo.dasboot"), new Double(52), peach}, - {"Hans", "Muller", rustred, getString("TableDemo.eraserhead"), new Double(0), pineapple}, - {"Joshua", "Outwater", blue, getString("TableDemo.labyrinth"), new Double(3), pineapple}, - {"Tim", "Prinzing", blue, getString("TableDemo.firstsight"), new Double(69), pepper}, - {"Raj", "Premkumar", jfcblue2, getString("TableDemo.none"), new Double(7), broccoli}, - {"Howard", "Rosen", green, getString("TableDemo.defending"), new Double(7), strawberry}, + {"Rick", "Levenson", black, getString("TableDemo.harold"), Double.valueOf(1327), raspberry}, + {"Brian", "Lichtenwalter", jfcblue, getString("TableDemo.fifthelement"), Double.valueOf(22), pear}, + {"Malini", "Minasandram", beige, getString("TableDemo.joyluck"), Double.valueOf(9), corn}, + {"Michael", "Martak", green, getString("TableDemo.city"), Double.valueOf(3), strawberry}, + {"David", "Mendenhall", forestgreen, getString("TableDemo.schindlerslist"), Double.valueOf(7), peach}, + {"Phil", "Milne", suspectpink, getString("TableDemo.withnail"), Double.valueOf(3), banana}, + {"Lynn", "Monsanto", cybergreen, getString("TableDemo.dasboot"), Double.valueOf(52), peach}, + {"Hans", "Muller", rustred, getString("TableDemo.eraserhead"), Double.valueOf(0), pineapple}, + {"Joshua", "Outwater", blue, getString("TableDemo.labyrinth"), Double.valueOf(3), pineapple}, + {"Tim", "Prinzing", blue, getString("TableDemo.firstsight"), Double.valueOf(69), pepper}, + {"Raj", "Premkumar", jfcblue2, getString("TableDemo.none"), Double.valueOf(7), broccoli}, + {"Howard", "Rosen", green, getString("TableDemo.defending"), Double.valueOf(7), strawberry}, {"Ray", "Ryan", black, getString("TableDemo.buckaroo"), - new Double(3.141592653589793238462643383279502884197169399375105820974944), banana}, - {"Georges", "Saab", aqua, getString("TableDemo.bicycle"), new Double(290), cantaloupe}, - {"Tom", "Santos", blue, getString("TableDemo.spinaltap"), new Double(241), pepper}, - {"Rich", "Schiavi", blue, getString("TableDemo.repoman"), new Double(0xFF), pepper}, - {"Nancy", "Schorr", green, getString("TableDemo.fifthelement"), new Double(47), watermelon}, - {"Keith", "Sprochi", darkgreen, getString("TableDemo.2001"), new Double(13), watermelon}, - {"Matt", "Tucker", eblue, getString("TableDemo.starwars"), new Double(2), broccoli}, - {"Dmitri", "Trembovetski", red, getString("TableDemo.aliens"), new Double(222), tomato}, - {"Scott", "Violet", violet, getString("TableDemo.raiders"), new Double(-97), banana}, - {"Kathy", "Walrath", darkgreen, getString("TableDemo.thinman"), new Double(8), pear}, - {"Nathan", "Walrath", black, getString("TableDemo.chusingura"), new Double(3), grapefruit}, - {"Steve", "Wilson", green, getString("TableDemo.raiders"), new Double(7), onion}, - {"Kathleen", "Zelony", gray, getString("TableDemo.dog"), new Double(13), grapes} + Double.valueOf(3.141592653589793238462643383279502884197169399375105820974944), banana}, + {"Georges", "Saab", aqua, getString("TableDemo.bicycle"), Double.valueOf(290), cantaloupe}, + {"Tom", "Santos", blue, getString("TableDemo.spinaltap"), Double.valueOf(241), pepper}, + {"Rich", "Schiavi", blue, getString("TableDemo.repoman"), Double.valueOf(0xFF), pepper}, + {"Nancy", "Schorr", green, getString("TableDemo.fifthelement"), Double.valueOf(47), watermelon}, + {"Keith", "Sprochi", darkgreen, getString("TableDemo.2001"), Double.valueOf(13), watermelon}, + {"Matt", "Tucker", eblue, getString("TableDemo.starwars"), Double.valueOf(2), broccoli}, + {"Dmitri", "Trembovetski", red, getString("TableDemo.aliens"), Double.valueOf(222), tomato}, + {"Scott", "Violet", violet, getString("TableDemo.raiders"), Double.valueOf(-97), banana}, + {"Kathy", "Walrath", darkgreen, getString("TableDemo.thinman"), Double.valueOf(8), pear}, + {"Nathan", "Walrath", black, getString("TableDemo.chusingura"), Double.valueOf(3), grapefruit}, + {"Steve", "Wilson", green, getString("TableDemo.raiders"), Double.valueOf(7), onion}, + {"Kathleen", "Zelony", gray, getString("TableDemo.dog"), Double.valueOf(13), grapes} }; // Create a model of the data. diff --git a/src/demo/share/jfc/TableExample/JDBCAdapter.java b/src/demo/share/jfc/TableExample/JDBCAdapter.java index 02d0d38..31e1113 100644 --- a/src/demo/share/jfc/TableExample/JDBCAdapter.java +++ b/src/demo/share/jfc/TableExample/JDBCAdapter.java @@ -125,12 +125,6 @@ connection.close(); } - @Override - protected void finalize() throws Throwable { - close(); - super.finalize(); - } - ////////////////////////////////////////////////////////////////////////// // // Implementation of the TableModel Interface diff --git a/src/demo/share/jfc/TableExample/TableExample3.java b/src/demo/share/jfc/TableExample/TableExample3.java index 3ab77df..9f3c11f 100644 --- a/src/demo/share/jfc/TableExample/TableExample3.java +++ b/src/demo/share/jfc/TableExample/TableExample3.java @@ -73,27 +73,27 @@ final String[] names = { "First Name", "Last Name", "Favorite Color", "Favorite Number", "Vegetarian" }; final Object[][] data = { - { "Mark", "Andrews", "Red", new Integer(2), Boolean.TRUE }, - { "Tom", "Ball", "Blue", new Integer(99), Boolean.FALSE }, - { "Alan", "Chung", "Green", new Integer(838), Boolean.FALSE }, - { "Jeff", "Dinkins", "Turquois", new Integer(8), Boolean.TRUE }, - { "Amy", "Fowler", "Yellow", new Integer(3), Boolean.FALSE }, - { "Brian", "Gerhold", "Green", new Integer(0), Boolean.FALSE }, - { "James", "Gosling", "Pink", new Integer(21), Boolean.FALSE }, - { "David", "Karlton", "Red", new Integer(1), Boolean.FALSE }, - { "Dave", "Kloba", "Yellow", new Integer(14), Boolean.FALSE }, - { "Peter", "Korn", "Purple", new Integer(12), Boolean.FALSE }, - { "Phil", "Milne", "Purple", new Integer(3), Boolean.FALSE }, - { "Dave", "Moore", "Green", new Integer(88), Boolean.FALSE }, - { "Hans", "Muller", "Maroon", new Integer(5), Boolean.FALSE }, - { "Rick", "Levenson", "Blue", new Integer(2), Boolean.FALSE }, - { "Tim", "Prinzing", "Blue", new Integer(22), Boolean.FALSE }, - { "Chester", "Rose", "Black", new Integer(0), Boolean.FALSE }, - { "Ray", "Ryan", "Gray", new Integer(77), Boolean.FALSE }, - { "Georges", "Saab", "Red", new Integer(4), Boolean.FALSE }, - { "Willie", "Walker", "Phthalo Blue", new Integer(4), Boolean.FALSE }, - { "Kathy", "Walrath", "Blue", new Integer(8), Boolean.FALSE }, - { "Arnaud", "Weber", "Green", new Integer(44), Boolean.FALSE } + { "Mark", "Andrews", "Red", Integer.valueOf(2), Boolean.TRUE }, + { "Tom", "Ball", "Blue", Integer.valueOf(99), Boolean.FALSE }, + { "Alan", "Chung", "Green", Integer.valueOf(838), Boolean.FALSE }, + { "Jeff", "Dinkins", "Turquois", Integer.valueOf(8), Boolean.TRUE }, + { "Amy", "Fowler", "Yellow", Integer.valueOf(3), Boolean.FALSE }, + { "Brian", "Gerhold", "Green", Integer.valueOf(0), Boolean.FALSE }, + { "James", "Gosling", "Pink", Integer.valueOf(21), Boolean.FALSE }, + { "David", "Karlton", "Red", Integer.valueOf(1), Boolean.FALSE }, + { "Dave", "Kloba", "Yellow", Integer.valueOf(14), Boolean.FALSE }, + { "Peter", "Korn", "Purple", Integer.valueOf(12), Boolean.FALSE }, + { "Phil", "Milne", "Purple", Integer.valueOf(3), Boolean.FALSE }, + { "Dave", "Moore", "Green", Integer.valueOf(88), Boolean.FALSE }, + { "Hans", "Muller", "Maroon", Integer.valueOf(5), Boolean.FALSE }, + { "Rick", "Levenson", "Blue", Integer.valueOf(2), Boolean.FALSE }, + { "Tim", "Prinzing", "Blue", Integer.valueOf(22), Boolean.FALSE }, + { "Chester", "Rose", "Black", Integer.valueOf(0), Boolean.FALSE }, + { "Ray", "Ryan", "Gray", Integer.valueOf(77), Boolean.FALSE }, + { "Georges", "Saab", "Red", Integer.valueOf(4), Boolean.FALSE }, + { "Willie", "Walker", "Phthalo Blue", Integer.valueOf(4), Boolean.FALSE }, + { "Kathy", "Walrath", "Blue", Integer.valueOf(8), Boolean.FALSE }, + { "Arnaud", "Weber", "Green", Integer.valueOf(44), Boolean.FALSE } }; // Create a model of the data. diff --git a/src/demo/share/jfc/TableExample/TableExample4.java b/src/demo/share/jfc/TableExample/TableExample4.java index 053c631..4d81a3d 100644 --- a/src/demo/share/jfc/TableExample/TableExample4.java +++ b/src/demo/share/jfc/TableExample/TableExample4.java @@ -75,27 +75,27 @@ final String[] names = { "First Name", "Last Name", "Favorite Color", "Favorite Number", "Vegetarian" }; final Object[][] data = { - { "Mark", "Andrews", "Red", new Integer(2), Boolean.TRUE }, - { "Tom", "Ball", "Blue", new Integer(99), Boolean.FALSE }, - { "Alan", "Chung", "Green", new Integer(838), Boolean.FALSE }, - { "Jeff", "Dinkins", "Turquois", new Integer(8), Boolean.TRUE }, - { "Amy", "Fowler", "Yellow", new Integer(3), Boolean.FALSE }, - { "Brian", "Gerhold", "Green", new Integer(0), Boolean.FALSE }, - { "James", "Gosling", "Pink", new Integer(21), Boolean.FALSE }, - { "David", "Karlton", "Red", new Integer(1), Boolean.FALSE }, - { "Dave", "Kloba", "Yellow", new Integer(14), Boolean.FALSE }, - { "Peter", "Korn", "Purple", new Integer(12), Boolean.FALSE }, - { "Phil", "Milne", "Purple", new Integer(3), Boolean.FALSE }, - { "Dave", "Moore", "Green", new Integer(88), Boolean.FALSE }, - { "Hans", "Muller", "Maroon", new Integer(5), Boolean.FALSE }, - { "Rick", "Levenson", "Blue", new Integer(2), Boolean.FALSE }, - { "Tim", "Prinzing", "Blue", new Integer(22), Boolean.FALSE }, - { "Chester", "Rose", "Black", new Integer(0), Boolean.FALSE }, - { "Ray", "Ryan", "Gray", new Integer(77), Boolean.FALSE }, - { "Georges", "Saab", "Red", new Integer(4), Boolean.FALSE }, - { "Willie", "Walker", "Phthalo Blue", new Integer(4), Boolean.FALSE }, - { "Kathy", "Walrath", "Blue", new Integer(8), Boolean.FALSE }, - { "Arnaud", "Weber", "Green", new Integer(44), Boolean.FALSE } + { "Mark", "Andrews", "Red", Integer.valueOf(2), Boolean.TRUE }, + { "Tom", "Ball", "Blue", Integer.valueOf(99), Boolean.FALSE }, + { "Alan", "Chung", "Green", Integer.valueOf(838), Boolean.FALSE }, + { "Jeff", "Dinkins", "Turquois", Integer.valueOf(8), Boolean.TRUE }, + { "Amy", "Fowler", "Yellow", Integer.valueOf(3), Boolean.FALSE }, + { "Brian", "Gerhold", "Green", Integer.valueOf(0), Boolean.FALSE }, + { "James", "Gosling", "Pink", Integer.valueOf(21), Boolean.FALSE }, + { "David", "Karlton", "Red", Integer.valueOf(1), Boolean.FALSE }, + { "Dave", "Kloba", "Yellow", Integer.valueOf(14), Boolean.FALSE }, + { "Peter", "Korn", "Purple", Integer.valueOf(12), Boolean.FALSE }, + { "Phil", "Milne", "Purple", Integer.valueOf(3), Boolean.FALSE }, + { "Dave", "Moore", "Green", Integer.valueOf(88), Boolean.FALSE }, + { "Hans", "Muller", "Maroon", Integer.valueOf(5), Boolean.FALSE }, + { "Rick", "Levenson", "Blue", Integer.valueOf(2), Boolean.FALSE }, + { "Tim", "Prinzing", "Blue", Integer.valueOf(22), Boolean.FALSE }, + { "Chester", "Rose", "Black", Integer.valueOf(0), Boolean.FALSE }, + { "Ray", "Ryan", "Gray", Integer.valueOf(77), Boolean.FALSE }, + { "Georges", "Saab", "Red", Integer.valueOf(4), Boolean.FALSE }, + { "Willie", "Walker", "Phthalo Blue", Integer.valueOf(4), Boolean.FALSE }, + { "Kathy", "Walrath", "Blue", Integer.valueOf(8), Boolean.FALSE }, + { "Arnaud", "Weber", "Green", Integer.valueOf(44), Boolean.FALSE } }; // Create a model of the data. diff --git a/src/demo/share/jfc/TableExample/TableSorter.java b/src/demo/share/jfc/TableExample/TableSorter.java index 31898db..5ca83aa 100644 --- a/src/demo/share/jfc/TableExample/TableSorter.java +++ b/src/demo/share/jfc/TableExample/TableSorter.java @@ -339,7 +339,7 @@ int column = tableView.convertColumnIndexToModel(viewColumn); if (e.getClickCount() == 1 && column != -1) { System.out.println("Sorting ..."); - int shiftPressed = e.getModifiers() & InputEvent.SHIFT_MASK; + int shiftPressed = e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK; boolean ascending = (shiftPressed == 0); sorter.sortByColumn(column, ascending); }